Revision: 3950
http://gar.svn.sourceforge.net/gar/?rev=3950&view=rev
Author: valholla
Date: 2009-03-25 15:58:13 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
cleanup the definition files
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
csw/mgar/pkg/gcc4/trunk/files/package_def.mk
csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-25 15:47:18 UTC (rev
3949)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-25 15:58:13 UTC (rev
3950)
@@ -12,12 +12,13 @@
AMD_MERGE_TARGETS += x86-merge-strip
merge-amd: $(AMD_MERGE_TARGETS)
- @$(DONADA)
+ @$(MAKECOOKIE)
x86-merge-dirs:
@(ginstall -d $(PKGROOT))
@(ginstall -d $(PPREFIX)/bin/amd64)
@(ginstall -d $(PPREFIX)/bin/i386)
+ @$(MAKECOOKIE)
x86-merge-amd:
@(echo "===> Merging AMD64")
@@ -26,6 +27,7 @@
@(cd $(AMD_BASE); pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
@(cd $(APREFIX)/bin; pax -rw * $(PPREFIX)/bin/amd64)
@(cd $(APREFIX)/bin/amd64; gln *-solaris2.* ../)
+ @$(MAKECOOKIE)
x86-merge-i386:
@(echo "===> Merging I386")
@@ -37,9 +39,11 @@
@(cd $(I386_BASE); pax -rw $(MPREFIX)/libexec $(PKGROOT))
@(cd $(IPREFIX)/bin; pax -rw * $(PPREFIX)/bin/i386)
@(cd $(APREFIX)/bin/i386; gln *-solaris2.* ../)
+ @$(MAKECOOKIE)
x86-merge-strip:
@(echo "===> Stripping Merged Binaries")
@(stripbin $(PPREFIX)/bin/amd64)
@(stripbin $(PPREFIX)/bin/i386)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-25 15:47:18 UTC
(rev 3949)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-25 15:58:13 UTC
(rev 3950)
@@ -30,34 +30,6 @@
BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
BOOT_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib
endif
- ISAEXEC_FILES += $(bindir)/addr2name.awk
- ISAEXEC_FILES += $(bindir)/gc-analyze
- ISAEXEC_FILES += $(bindir)/gcjh
- ISAEXEC_FILES += $(bindir)/gjarsigner
- ISAEXEC_FILES += $(bindir)/grmic
- ISAEXEC_FILES += $(bindir)/c++
- ISAEXEC_FILES += $(bindir)/gcc
- ISAEXEC_FILES += $(bindir)/gcov
- ISAEXEC_FILES += $(bindir)/gjavah
- ISAEXEC_FILES += $(bindir)/grmid
- ISAEXEC_FILES += $(bindir)/jcf-dump
- ISAEXEC_FILES += $(bindir)/cpp
- ISAEXEC_FILES += $(bindir)/gccbug
- ISAEXEC_FILES += $(bindir)/gfortran
- ISAEXEC_FILES += $(bindir)/gkeytool
- ISAEXEC_FILES += $(bindir)/grmiregistry
- ISAEXEC_FILES += $(bindir)/jv-convert
- ISAEXEC_FILES += $(bindir)/g++
- ISAEXEC_FILES += $(bindir)/gcj
- ISAEXEC_FILES += $(bindir)/gij
- ISAEXEC_FILES += $(bindir)/gnative2ascii
- ISAEXEC_FILES += $(bindir)/gserialver
- ISAEXEC_FILES += $(bindir)/gappletviewer
- ISAEXEC_FILES += $(bindir)/gcj-dbtool
- ISAEXEC_FILES += $(bindir)/gjar
- ISAEXEC_FILES += $(bindir)/gorbd
- ISAEXEC_FILES += $(bindir)/gtnameserv
-
endif
export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS
@@ -66,7 +38,6 @@
CONFIGURE_SCRIPTS = objdir
TEST_SCRIPTS = skip
post-configure-modulated: fix-bootflags
-
MERGE_SCRIPTS_isa-i386 = amd
## Run checkpkg Manually
Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-25 15:47:18 UTC
(rev 3949)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-25 15:58:13 UTC
(rev 3950)
@@ -1,101 +1,131 @@
- ### Package Section ###
+### Package Section ###
PACKAGES = CSWgcc4core CSWgcc4corert CSWgcc4gfortran
PACKAGES += CSWgcc4gfortranrt CSWgcc4java CSWgcc4javart
PACKAGES += CSWgcc4objc CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt
## Define Package Catalog Names
-CATALOGNAME_CSWgcc4core = gcc4core
-CATALOGNAME_CSWgcc4corert = gcc4corert
-CATALOGNAME_CSWgcc4g++ = gcc4g++
-CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
-CATALOGNAME_CSWgcc4gfortran = gcc4gfortran
+CATALOGNAME_CSWgcc4core = gcc4core
+CATALOGNAME_CSWgcc4corert = gcc4corert
+CATALOGNAME_CSWgcc4g++ = gcc4g++
+CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
+CATALOGNAME_CSWgcc4gfortran = gcc4gfortran
CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
-CATALOGNAME_CSWgcc4java = gcc4java
-CATALOGNAME_CSWgcc4javart = gcc4javart
-CATALOGNAME_CSWgcc4objc = gcc4objc
-CATALOGNAME_CSWgcc4objcrt = gcc4obcrt
+CATALOGNAME_CSWgcc4java = gcc4java
+CATALOGNAME_CSWgcc4javart = gcc4javart
+CATALOGNAME_CSWgcc4objc = gcc4objc
+CATALOGNAME_CSWgcc4objcrt = gcc4obcrt
## Copyright File
-LICENSE_CSWgcc4core = COPYING3
-LICENSE_CSWgcc4corert = COPYING3
-LICENSE_CSWgcc4g++ = COPYING3
-LICENSE_CSWgcc4g++rt = COPYING3
-LICENSE_CSWgcc4gfortran = COPYING3
+LICENSE_CSWgcc4core = COPYING3
+LICENSE_CSWgcc4corert = COPYING3
+LICENSE_CSWgcc4g++ = COPYING3
+LICENSE_CSWgcc4g++rt = COPYING3
+LICENSE_CSWgcc4gfortran = COPYING3
LICENSE_CSWgcc4gfortranrt = COPYING3
-LICENSE_CSWgcc4java = COPYING3
-LICENSE_CSWgcc4javart = COPYING3
-LICENSE_CSWgcc4objc = COPYING3
-LICENSE_CSWgcc4objcrt = COPYING3
+LICENSE_CSWgcc4java = COPYING3
+LICENSE_CSWgcc4javart = COPYING3
+LICENSE_CSWgcc4objc = COPYING3
+LICENSE_CSWgcc4objcrt = COPYING3
## Define Package Descriptions
-SPKG_DESC_CSWgcc4core = GNU C Compiler
-SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time
-SPKG_DESC_CSWgcc4coredocs = GNU C Compiler Documtation and man pages
-SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
-SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler
+SPKG_DESC_CSWgcc4core = GNU C Compiler
+SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time
+SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
+SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
+SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler
SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
-SPKG_DESC_CSWgcc4java = GNU Java Compiler
-SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time
-SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler
-SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time
+SPKG_DESC_CSWgcc4java = GNU Java Compiler
+SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time
+SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler
+SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time
## Define Dependencies
-COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr
-REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4gfortran95 = CSWgcc4gfortranrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt CSWiconv
-REQUIRED_PKGS_CSWgcc4java = CSWgcc4javart CSWgcc4corert
-REQUIRED_PKGS_CSWgcc4java += CSWzlib $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4objc = CSWgcc4objcrt $(COMMON_REQUIRE)
+COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr
+REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert CSWiconv
+REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4g++rt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert CSWiconv
+REQUIRED_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt CSWiconv
+REQUIRED_PKGS_CSWgcc4java = CSWgcc4javart CSWgcc4corert
+REQUIRED_PKGS_CSWgcc4java += CSWzlib $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert CSWiconv
+REQUIRED_PKGS_CSWgcc4objc = CSWgcc4objcrt $(COMMON_REQUIRE)
+## Define ISAEXEC
+ISAEXEC_FILES_CSWgcc4core_i386 = /opt/csw/gcc4/bin/gcc
+ISAEXEC_FILES_CSWgcc4core_i386 += /opt/csw/gcc4/bin/gcov
+ISAEXEC_FILES_CSWgcc4core_i386 += /opt/csw/gcc4/bin/gccbug
+ISAEXEC_FILES_CSWgcc4gfortran_i386 = /opt/csw/gcc4/bin/gfortran
+ISAEXEC_FILES_CSWgcc4g++_i386 = /opt/csw/gcc4/bin/c++
+ISAEXEC_FILES_CSWgcc4g++_i386 += /opt/csw/gcc4/bin/g++
+ISAEXEC_FILES_CSWgcc4g++_i386 += /opt/csw/gcc4/bin/cpp
+ISAEXEC_FILES_CSWgcc4java_i386 = /opt/csw/gcc4/bin/addr2name.awk
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gc-analyze
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gcjh
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gjarsigner
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/grmic
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gjavah
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/grmid
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/jcf-dump
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gkeytool
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/grmiregistry
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/jv-convert
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gcj
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gij
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gnative2ascii
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gserialver
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gappletviewer
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gcj-dbtool
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gjar
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gorbd
+ISAEXEC_FILES_CSWgcc4java_i386 += /opt/csw/gcc4/bin/gtnameserv
+
## Define the Contents of the Packages
## gcc4gfortran Definitions
-PKGFILES_CSWgcc4gfortran = .*/bin/.*/gfortran
-PKGFILES_CSWgcc4gfortran += .*/libexec/.*/f951
+PKGFILES_CSWgcc4gfortran = .*/bin/.*gfortran
+PKGFILES_CSWgcc4gfortran += .*/libexec/.*f951
+PKGFILES_CSWgcc4gfortran += .*/man1/gfortran.1
+PKGFILES_CSWgcc4gfortran += .*/info/gfortran.*
## gcc4g++ Definitions
-PKGFILES_CSWgcc4g++ = .*/bin/.*/.*g\+\+
-PKGFILES_CSWgcc4g++ += .*/bin/.*/.*c\+\+
-PKGFILES_CSWgcc4g++ += .*/bin/.*/.*cpp
-PKGFILES_CSWgcc4g++ += .*/libexec/.*/cc1plus
+PKGFILES_CSWgcc4g++ = .*/bin/.*g\+\+
+PKGFILES_CSWgcc4g++ += .*/bin/.*c\+\+
+PKGFILES_CSWgcc4g++ += .*/bin/.*cpp
+PKGFILES_CSWgcc4g++ += .*/libexec/.*cc1plus
PKGFILES_CSWgcc4g++ += .*/include/c\+\+/.*
PKGFILES_CSWgcc4g++ += .*/man1/g\+\+.1
PKGFILES_CSWgcc4g++ += .*/man1/cpp.1
PKGFILES_CSWgcc4g++ += .*/info/cpp.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/org/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/java.*/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/gcj/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/classpath/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/awt/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*/gnu/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ = .*/include/.*org/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*java.*/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*gcj/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*classpath/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*awt/.*
+EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*gnu/.*
## gcc4java Definitions
-PKGFILES_CSWgcc4java = .*/bin/.*/gcj.*
-PKGFILES_CSWgcc4java += .*/bin/.*/jv-scan
-PKGFILES_CSWgcc4java += .*/bin/.*/jv-convert
-PKGFILES_CSWgcc4java += .*/bin/.*/jcf-dump
-PKGFILES_CSWgcc4java += .*/bin/.*/grmi.*
-PKGFILES_CSWgcc4java += .*/bin/.*/grepjar
-PKGFILES_CSWgcc4java += .*/bin/.*/gjnih
-PKGFILES_CSWgcc4java += .*/bin/.*/gij
-PKGFILES_CSWgcc4java += .*/bin/.*/fastjar
-PKGFILES_CSWgcc4java += .*/bin/.*/gjar.*
-PKGFILES_CSWgcc4java += .*/bin/.*/gjavah
-PKGFILES_CSWgcc4java += .*/bin/.*/gorbd
-PKGFILES_CSWgcc4java += .*/bin/.*/addr2name.awk
-PKGFILES_CSWgcc4java += .*/bin/.*/gappletviewer
-PKGFILES_CSWgcc4java += .*/bin/.*/gkeytool
-PKGFILES_CSWgcc4java += .*/bin/.*/gserialver
-PKGFILES_CSWgcc4java += .*/bin/.*/gtnameserv
-PKGFILES_CSWgcc4java += .*/bin/.*/gnative2ascii
-PKGFILES_CSWgcc4java += .*/bin/.*/gc-analyze
+PKGFILES_CSWgcc4java = .*/bin/.*gcj.*
+PKGFILES_CSWgcc4java += .*/bin/.*jv-scan
+PKGFILES_CSWgcc4java += .*/bin/.*jv-convert
+PKGFILES_CSWgcc4java += .*/bin/.*jcf-dump
+PKGFILES_CSWgcc4java += .*/bin/.*grmi.*
+PKGFILES_CSWgcc4java += .*/bin/.*grepjar
+PKGFILES_CSWgcc4java += .*/bin/.*gjnih
+PKGFILES_CSWgcc4java += .*/bin/.*gij
+PKGFILES_CSWgcc4java += .*/bin/.*fastjar
+PKGFILES_CSWgcc4java += .*/bin/.*gjar.*
+PKGFILES_CSWgcc4java += .*/bin/.*gjavah
+PKGFILES_CSWgcc4java += .*/bin/.*gorbd
+PKGFILES_CSWgcc4java += .*/bin/.*addr2name.awk
+PKGFILES_CSWgcc4java += .*/bin/.*gappletviewer
+PKGFILES_CSWgcc4java += .*/bin/.*gkeytool
+PKGFILES_CSWgcc4java += .*/bin/.*gserialver
+PKGFILES_CSWgcc4java += .*/bin/.*gtnameserv
+PKGFILES_CSWgcc4java += .*/bin/.*gnative2ascii
+PKGFILES_CSWgcc4java += .*/bin/.*gc-analyze
PKGFILES_CSWgcc4java += .*/man1/gcj.*
PKGFILES_CSWgcc4java += .*/man1/gij.*
PKGFILES_CSWgcc4java += .*/man1/jv.*
@@ -111,19 +141,19 @@
PKGFILES_CSWgcc4java += .*/man1/gtnameserv.*
PKGFILES_CSWgcc4java += .*/man1/gnative2ascii.*
PKGFILES_CSWgcc4java += .*/man1/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/libexec/.*/collect.*
-PKGFILES_CSWgcc4java += .*/libexec/.*/jvgenmain
-PKGFILES_CSWgcc4java += .*/libexec/.*/jc1.*
-PKGFILES_CSWgcc4java += .*/info/.*/gcj.*
-PKGFILES_CSWgcc4java += .*/include/.*/gcj/.*
-PKGFILES_CSWgcc4java += .*/include/.*/awt/.*
-PKGFILES_CSWgcc4java += .*/include/.*/classpath/.*
-PKGFILES_CSWgcc4java += .*/include/.*/java.*
-PKGFILES_CSWgcc4java += .*/include/.*/ffi.h
-PKGFILES_CSWgcc4java += .*/include/.*/org/.*
+PKGFILES_CSWgcc4java += .*/libexec/.*collect.*
+PKGFILES_CSWgcc4java += .*/libexec/.*jvgenmain
+PKGFILES_CSWgcc4java += .*/libexec/.*jc1.*
+PKGFILES_CSWgcc4java += .*/info/gcj.*
+PKGFILES_CSWgcc4java += .*/include/.*gcj/.*
+PKGFILES_CSWgcc4java += .*/include/.*awt/.*
+PKGFILES_CSWgcc4java += .*/include/.*classpath/.*
+PKGFILES_CSWgcc4java += .*/include/.*java.*
+PKGFILES_CSWgcc4java += .*/include/.*ffi.h
+PKGFILES_CSWgcc4java += .*/include/.*org/.*
## gcc4objc Definitions
-PKGFILES_CSWgcc4objc = .*/libexec/.*/cc1obj
+PKGFILES_CSWgcc4objc = .*/libexec/.*cc1obj
####### RunTime Packages
@@ -134,21 +164,22 @@
PKGFILES_CSWgcc4corert += .*/lib/.*libssp.*
## gcc4gfortranrt
-PKGFILES_CSWgcc4gfortranrt = .*/lib/.*/libgfortran.*
+PKGFILES_CSWgcc4gfortranrt = .*/lib/.*libgfortran.*
## gcc4g++rt
PKGFILES_CSWgcc4g++rt = .*/lib/.*libstdc.*
+PKGFILES_CSWgcc4g++rt += .*/lib/.*libsupc\+\+.*
## gcc4javart
PKGFILES_CSWgcc4javart = .*/share/java/.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/libgij.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/libffi.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/lib-gnu-awt.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/security/classpath.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/logging.properties
-PKGFILES_CSWgcc4javart += .*/lib/.*/pkgconfig.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/gcj.*
-PKGFILES_CSWgcc4javart += .*/lib/.*/libgcj.*
+PKGFILES_CSWgcc4javart += .*/lib/.*libgij.*
+PKGFILES_CSWgcc4javart += .*/lib/.*libffi.*
+PKGFILES_CSWgcc4javart += .*/lib/.*lib-gnu-awt.*
+PKGFILES_CSWgcc4javart += .*/lib/.*security/classpath.*
+PKGFILES_CSWgcc4javart += .*/lib/.*logging.properties
+PKGFILES_CSWgcc4javart += .*/lib/.*pkgconfig.*
+PKGFILES_CSWgcc4javart += .*/lib/.*gcj.*
+PKGFILES_CSWgcc4javart += .*/lib/.*libgcj.*
## gcc4objc Runtime
-PKGFILES_CSWgcc4objcrt = .*/lib/.*/libobjc.*
+PKGFILES_CSWgcc4objcrt = .*/lib/.*libobjc.*
Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-25 15:47:18 UTC
(rev 3949)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-25 15:58:13 UTC
(rev 3950)
@@ -1,24 +1,22 @@
-
-
-## Create lib links
+## Create lib links to conform to multi-arch standards
post-merge-isa-sparcv8:
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s sparcv9 64)
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . sparcv8)
- @$(DONADA)
+ @$(MAKECOOKIE)
post-merge-isa-i386:
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s amd64 64)
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . i386)
- @$(DONADA)
+ @$(MAKECOOKIE)
## Create $(OBJECT_DIR) to build in
post-extract-$(addprefix post-extract-,$(MODULATIONS)):
@(echo "==> Creating Object Dir for Building")
@( mkdir $(OBJECT_DIR) )
- $(DONADA)
+ $(MAKECOOKIE)
## instead of changing to $(WORKSRC) and running configure
## Run it from the $(OBJECT_DIR)
@@ -26,7 +24,7 @@
echo "==> Running Configure from $(OBJECT_DIR)"
cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
../$(DISTNAME)/configure $(CONFIGURE_ARGS)
- $(DONADA)
+ $(MAKECOOKIE)
## Set the CFLAGS so the correct architecture is used
fix-bootflags:
@@ -34,8 +32,8 @@
$(WORKSRC)/Makefile)
@(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \
$(WORKSRC)/Makefile)
- @$(DONADA)
+ @$(MAKECOOKIE)
test-skip:
- @$(DONADA)
+ @$(MAKECOOKIE)
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
