Revision: 15461
http://gar.svn.sourceforge.net/gar/?rev=15461&view=rev
Author: wahwah
Date: 2011-08-29 15:14:10 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: Using program suffix
Modified Paths:
--------------
csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile 2011-08-29 15:12:45 UTC
(rev 15460)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile 2011-08-29 15:14:10 UTC
(rev 15461)
@@ -10,6 +10,7 @@
VERSION = 4.6.1
CATEGORIES = lang
GARTYPE = v2
+BASE_VERSION = $(shell echo $(VERSION) | gsed -e
's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
DESCRIPTION = The GNU Compiler Collection
define BLURB
@@ -44,8 +45,8 @@
# http://gcc.gnu.org/install/configure.html
# Could be used to break out of the /opt/csw/gcc4 prefix
-PROGRAM_PREFIX = gcc4-
-CONFIGURE_ARGS += --program-prefix=$(PROGRAM_PREFIX)
+PROGRAM_SUFFIX = -$(BASE_VERSION)
+CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += --with-gnu-as
@@ -306,8 +307,8 @@
PACKAGES += CSWgcc4g++
CATALOGNAME_CSWgcc4g++ = gcc4g++
SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++ = $(bindir)/$(PROGRAM_PREFIX)[cg]\+\+
-PKGFILES_CSWgcc4g++ +=
$(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)[cg]\+\+
+PKGFILES_CSWgcc4g++ = $(bindir)/[cg]\+\+$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4g++ +=
$(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+$(PROGRAM_SUFFIX)
PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -333,8 +334,8 @@
RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgfortran3
RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpc2
RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
-PKGFILES_CSWgcc4gfortran = $(bindir)/$(PROGRAM_PREFIX)gfortran
-PKGFILES_CSWgcc4gfortran +=
$(bindir)/\w+-\w+-solaris[\d\.]+-$(PROGRAM_PREFIX)gfortran
+PKGFILES_CSWgcc4gfortran = $(bindir)/gfortran$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4gfortran +=
$(bindir)/\w+-\w+-solaris[\d\.]+-gfortran$(PROGRAM_SUFFIX)
PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
@@ -355,25 +356,25 @@
RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpc2
RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibz1
-PKGFILES_CSWgcc4java = $(bindir)/$(PROGRAM_PREFIX).*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gij
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/$(PROGRAM_PREFIX).*gc-analyze
+PKGFILES_CSWgcc4java = $(bindir)/.*gcj.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*grepjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjnih$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gij$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*fastjar$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gjavah$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gorbd$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gserialver$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii$(PROGRAM_SUFFIX)
+PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze$(PROGRAM_SUFFIX)
PKGFILES_CSWgcc4java += $(mandir)/.*/gcj.*
PKGFILES_CSWgcc4java += $(mandir)/.*/gij.*
PKGFILES_CSWgcc4java += $(mandir)/.*/jv.*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
