[csw-devel] SF.net SVN: gar:[4307] csw/mgar/pkg/gcc4/trunk/files

valholla at users.sourceforge.net valholla at users.sourceforge.net
Tue Apr 14 20:30:47 CEST 2009


Revision: 4307
          http://gar.svn.sourceforge.net/gar/?rev=4307&view=rev
Author:   valholla
Date:     2009-04-14 18:30:47 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
update packages for correct runtime versions

Modified Paths:
--------------
    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/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-04-14 15:50:11 UTC (rev 4306)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-04-14 18:30:47 UTC (rev 4307)
@@ -3,7 +3,7 @@
 WORKDIR       = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
 PATCHDIR      = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
 INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
-PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH))
+PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GAROSREL)-$(GARCH))
 OBJECT_DIR    = $(WORKDIR)/objdir
 WORKSRC       = $(OBJECT_DIR)
 DIRPATHS      = 
@@ -38,7 +38,7 @@
 CONFIGURE_SCRIPTS       = objdir
 TEST_SCRIPTS            = skip
 post-configure-modulated: fix-bootflags
-MERGE_SCRIPTS_isa-i386  = amd
+#MERGE_SCRIPTS_isa-i386  = amd
 
 ## Run checkpkg Manually
 ENABLE_CHECK            = 0

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-14 15:50:11 UTC (rev 4306)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-14 18:30:47 UTC (rev 4307)
@@ -62,121 +62,119 @@
 ## Define Dependencies 
 COMMON_REQUIRE                   = CSWiconv CSWlibgmp CSWlibmpfr
 REQUIRED_PKGS_CSWgcc4adart       = CSWggettextrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4ada         = CSWgcc4adart $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4ada         = CSWgcc4core $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4corert      = CSWggettextrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4core        = CSWgcc4corert $(COMMON_REQUIRE) CSWbinutils
+REQUIRED_PKGS_CSWgcc4core        = $(COMMON_REQUIRE) CSWbinutils CSWggettextrt
 REQUIRED_PKGS_CSWgcc4g++rt       = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4g++         = CSWgcc4g++rt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4g++         = CSWgcc4core $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4gfortran    = CSWgcc4gfortranrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4gfortran    = CSWgcc4core $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt CSWiconv
-REQUIRED_PKGS_CSWgcc4java        = CSWgcc4javart CSWgcc4corert 
-REQUIRED_PKGS_CSWgcc4java       += CSWzlib $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4java        = CSWgcc4core CSWzlib $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4objcrt      = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4objc        = CSWgcc4objcrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4objc        = CSWgcc4core $(COMMON_REQUIRE)
 
 ## Define the Contents of the Packages
 
 ## gcc4ada Definitions
-PKGFILES_CSWgcc4ada  = .*/libexec/.*gnat1
-PKGFILES_CSWgcc4ada += .*/adalib/.*
-PKGFILES_CSWgcc4ada += .*/adainclude/.*
-PKGFILES_CSWgcc4ada += .*/info/.*gnat.*
-PKGFILES_CSWgcc4ada += .*/bin/gnat.*
+PKGFILES_CSWgcc4ada  = .*/gcc4/libexec/.*gnat1
+PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.*
+PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.*
+PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.*
+PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat.*
 
 ## gcc4gfortran Definitions
-PKGFILES_CSWgcc4gfortran  = .*/bin/.*gfortran
-PKGFILES_CSWgcc4gfortran += .*/libexec/.*f951
-PKGFILES_CSWgcc4gfortran += .*/man1/gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/info/gfortran.*
+PKGFILES_CSWgcc4gfortran  = .*/gcc4/bin/.*gfortran
+PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951
+PKGFILES_CSWgcc4gfortran += .*/gcc4/man1/gfortran.1
+PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
 
 ## gcc4g++ Definitions
-PKGFILES_CSWgcc4g++  = .*/bin/.*g\+\+
-PKGFILES_CSWgcc4g++ += .*/bin/.*c\+\+
-PKGFILES_CSWgcc4g++ += .*/libexec/.*cc1plus
-PKGFILES_CSWgcc4g++ += .*/man1/g\+\+.1
-PKGFILES_CSWgcc4g++ += .*/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
-PKGFILES_CSWgcc4g++ += .*/include/c\+\+/(\d+(?:\.\d+)*)/ostream.*
+PKGFILES_CSWgcc4g++  = .*/gcc4/bin/.*g\+\+
+PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+
+PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus
+PKGFILES_CSWgcc4g++ += .*/gcc4/man1/g\+\+.1
+PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
+PKGFILES_CSWgcc4g++ += .*/gcc4/include/c\+\+/(\d+(?:\.\d+)*)/ostream.*
 
 ## 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 += .*/man1/gcj.*
-PKGFILES_CSWgcc4java += .*/man1/gij.*
-PKGFILES_CSWgcc4java += .*/man1/jv.*
-PKGFILES_CSWgcc4java += .*/man1/jcf.*
-PKGFILES_CSWgcc4java += .*/man1/grmi.*
-PKGFILES_CSWgcc4java += .*/man1/.*jar.*
-PKGFILES_CSWgcc4java += .*/man1/.*jni.*
-PKGFILES_CSWgcc4java += .*/man1/.*java.*
-PKGFILES_CSWgcc4java += .*/man1/gorbd.*
-PKGFILES_CSWgcc4java += .*/man1/gapplet.*
-PKGFILES_CSWgcc4java += .*/man1/gkeytool.*
-PKGFILES_CSWgcc4java += .*/man1/gserialver.*
-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  = .*/gcc4/bin/.*gcj.*
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-scan
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jv-convert
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*jcf-dump
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grmi.*
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*grepjar
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjnih
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gij
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*fastjar
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjar.*
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gjavah
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gorbd
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*addr2name.awk
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gappletviewer
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gkeytool
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gserialver
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gtnameserv
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gnative2ascii
+PKGFILES_CSWgcc4java += .*/gcc4/bin/.*gc-analyze
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gcj.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gij.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/jv.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/jcf.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/grmi.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/.*jar.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/.*jni.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/.*java.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gorbd.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gapplet.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gkeytool.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gserialver.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gtnameserv.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gnative2ascii.*
+PKGFILES_CSWgcc4java += .*/gcc4/man1/gc-analyze.*
+PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*collect.*
+PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jvgenmain
+PKGFILES_CSWgcc4java += .*/gcc4/libexec/.*jc1.*
+PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*gcj/.*
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*awt/.*
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*classpath/.*
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*java.*
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*ffi.h
+PKGFILES_CSWgcc4java += .*/gcc4/include/.*org/.*
 
 ## gcc4objc Definitions
-PKGFILES_CSWgcc4objc  = .*/libexec/.*cc1obj
-PKGFILES_CSWgcc4objc += .*/include/.*objc/.*
+PKGFILES_CSWgcc4objc  = .*/gcc4/libexec/.*cc1obj
+PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.*
 
 #######  RunTime Packages
 
 ## gcc4adart
-PKGFILES_CSWgcc4adart  = .*/lib/.*libgnat.*
-PKGFILES_CSWgcc4adart += .*/lib/.*libgnarl.*
+PKGFILES_CSWgcc4adart  = .*/opt/csw/lib/.*libgnat.*
+PKGFILES_CSWgcc4adart += .*/opt/csw/lib/.*libgnarl.*
 
 ## gcc4corert
-PKGFILES_CSWgcc4corert  = .*/lib/.*libgcc_s.*
-PKGFILES_CSWgcc4corert += .*/lib/.*libgomp.*
-PKGFILES_CSWgcc4corert += .*/lib/.*libiberty.*
-PKGFILES_CSWgcc4corert += .*/lib/.*libssp.*
+PKGFILES_CSWgcc4corert  = .*/opt/csw/lib/.*libgcc_s.*
+PKGFILES_CSWgcc4corert += .*/opt/csw/lib/.*libgomp.*
+PKGFILES_CSWgcc4corert += .*/opt/csw/lib/.*libiberty.*
+PKGFILES_CSWgcc4corert += .*/opt/csw/lib/.*libssp.*
 
 ## gcc4gfortranrt 
-PKGFILES_CSWgcc4gfortranrt  = .*/lib/.*libgfortran.*
+PKGFILES_CSWgcc4gfortranrt  = .*/opt/csw/lib/.*libgfortran.*
 
 ## gcc4g++rt
-PKGFILES_CSWgcc4g++rt  = .*/lib/.*libstdc.*
-PKGFILES_CSWgcc4g++rt += .*/lib/.*libsupc\+\+.*
+PKGFILES_CSWgcc4g++rt  = .*/opt/csw/lib/.*libstdc.*
+PKGFILES_CSWgcc4g++rt += .*/opt/csw/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  = .*/opt/csw/lib/.*libgij.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*libffi.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*lib-gnu-awt.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*security/classpath.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*logging.properties
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*pkgconfig.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*gcj.*
+PKGFILES_CSWgcc4javart += .*/opt/csw/lib/.*libgcj.*
 
 ## gcc4objc Runtime
-PKGFILES_CSWgcc4objcrt = .*/lib/.*libobjc.*
+PKGFILES_CSWgcc4objcrt = .*/opt/csw/lib/.*libobjc.*

Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-04-14 15:50:11 UTC (rev 4306)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-04-14 18:30:47 UTC (rev 4307)
@@ -27,6 +27,29 @@
 		$(WORKSRC)/Makefile)
 	@$(MAKECOOKIE)
 
+post-merge-modulated:
+	@( gecho "[===> Creating Runtime Package files <===]" )
+	@( ginstall -d $(PKGROOT)/opt/csw/lib )
+	@( gcp -d $(PKGROOT)/opt/csw/gcc4/lib/*.so* $(PKGROOT)/opt/csw/lib/ )
+	@( gchmod 0755 $(PKGROOT)/opt/csw/lib/*.so* )
+	@( gcp -d $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \
+		$(PKGROOT)/opt/csw/lib/ )
+	@( if [ "`uname -p`" = 'i386' ]; then \
+	    if [ "`uname -r`" = '5.10' ]; then \
+			ginstall -d $(PKGROOT)/opt/csw/lib/amd64; \
+			gcp -d $(PKGROOT)/opt/csw/gcc4/lib/amd64/*.so* \
+					$(PKGROOT)/opt/csw/lib/amd64/; \
+			gchmod 0755 $(PKGROOT)/opt/csw/lib/amd64/*.so*; \
+		fi; \
+	fi ) 
+	@( if [ "`uname -p`" = 'sparc' ]; then \
+		ginstall -d $(PKGROOT)/opt/csw/lib/sparcv9; \
+		gcp -d $(PKGROOT)/opt/csw/gcc4/lib/sparcv9/*.so* \
+				$(PKGROOT)/opt/csw/lib/sparcv9/; \
+		gchmod 0755 $(PKGROOT)/opt/csw/lib/sparcv9/*.so*; \
+	fi )
+	@$(MAKECOOKIE)
+
 test-skip:
 	@$(MAKECOOKIE)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list