Revision: 4348
http://gar.svn.sourceforge.net/gar/?rev=4348&view=rev
Author: valholla
Date: 2009-04-16 14:16:56 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
fixed postinstall and other pkg tweaks
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/Makefile
csw/mgar/pkg/gcc4/trunk/checksums
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
Added Paths:
-----------
csw/mgar/pkg/gcc4/trunk/files/CSWgcc4core.space
csw/mgar/pkg/gcc4/trunk/files/package_files.mk
Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-16 12:54:33 UTC (rev 4347)
+++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-04-16 14:16:56 UTC (rev 4348)
@@ -42,5 +42,7 @@
include files/gar_override.mk
include files/package_def.mk
include files/pkg_scripts.mk
+include files/package_files.mk
+include files/amd_merge.mk
## include mGar definitions
include gar/category.mk
Modified: csw/mgar/pkg/gcc4/trunk/checksums
===================================================================
--- csw/mgar/pkg/gcc4/trunk/checksums 2009-04-16 12:54:33 UTC (rev 4347)
+++ csw/mgar/pkg/gcc4/trunk/checksums 2009-04-16 14:16:56 UTC (rev 4348)
@@ -1,3 +1,2 @@
cc3c5565fdb9ab87a05ddb106ba0bd1f download/gcc-4.3.3.tar.bz2
-9644641dee1c5433930319b20710dca3 download/re-enable-alloc.diff
-57900f0dad9f424a43e7d1aa502070b8 download/split-insn-attrtab.diff
+9883bd7887c22e1180b9dae4f2acd8ec download/CSWgcc4core.space
Added: csw/mgar/pkg/gcc4/trunk/files/CSWgcc4core.space
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/CSWgcc4core.space
(rev 0)
+++ csw/mgar/pkg/gcc4/trunk/files/CSWgcc4core.space 2009-04-16 14:16:56 UTC
(rev 4348)
@@ -0,0 +1 @@
+/opt 1340 200
Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-04-16 12:54:33 UTC
(rev 4347)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-04-16 14:16:56 UTC
(rev 4348)
@@ -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-16 12:54:33 UTC
(rev 4347)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-04-16 14:16:56 UTC
(rev 4348)
@@ -1,7 +1,7 @@
### Package Section ###
-PACKAGES = CSWgcc4ada CSWgcc4adart CSWgcc4core CSWgcc4corert CSWgcc4gfortran
-PACKAGES += CSWgcc4gfortranrt CSWgcc4java CSWgcc4javart CSWgcc4objc
-PACKAGES += CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt
+PACKAGES = CSWgcc4ada CSWgcc4adart CSWgcc4gfortran CSWgcc4gfortranrt
+PACKAGES += CSWgcc4java CSWgcc4javart CSWgcc4objc CSWgcc4objcrt
+PACKAGES += CSWgcc4g++ CSWgcc4g++rt CSWgcc4corert CSWgcc4core
## Define Package Catalog Names
CATALOGNAME_CSWgcc4ada = gcc4ada
@@ -60,136 +60,91 @@
SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time
## Define Dependencies
-COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr
-REQUIRED_PKGS_CSWgcc4adart = CSWggettextrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4ada = CSWgcc4core $(COMMON_REQUIRE)
+COMMON_REQUIRE = CSWiconv CSWlibgmp CSWlibmpfr CSWggettextrt
+REQUIRED_PKGS_CSWgcc4adart = CSWgcc4corert CSWggettextrt
$(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4ada = CSWgcc4core CSWgcc4corert
+REQUIRED_PKGS_CSWgcc4ada += CSWgcc4adart $(COMMON_REQUIRE)
REQUIRED_PKGS_CSWgcc4corert = CSWggettextrt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4core = $(COMMON_REQUIRE) CSWbinutils CSWggettextrt
-REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4core $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4gfortran = CSWgcc4core $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt CSWiconv
-REQUIRED_PKGS_CSWgcc4java = CSWgcc4core CSWzlib $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert CSWiconv
-REQUIRED_PKGS_CSWgcc4objc = CSWgcc4core $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4g++rt = CSWgcc4corert $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4g++ = CSWgcc4core CSWgcc4corert
+REQUIRED_PKGS_CSWgcc4g++ += CSWgcc4g++rt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4gfortranrt = CSWgcc4corert $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4gfortran = CSWgcc4core CSWgcc4corert
+REQUIRED_PKGS_CSWgcc4gfortran += CSWgcc4gfortranrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4java = CSWgcc4core CSWgcc4corert CSWjavart CSWzlib
+REQUIRED_PKGS_CSWgcc4java += CSWgcc4g++ CSWgcc4g++rt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4objcrt = CSWgcc4corert $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4objc = CSWgcc4core CSWgcc4corert
+REQUIRED_PKGS_CSWgcc4objc += CSWgcc4objcrt $(COMMON_REQUIRE)
-## Define the Contents of the Packages
+DISTFILES += CSWgcc4core.space
-## gcc4ada Definitions
-PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1
-PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*
-PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*
-PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.*
-PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.*
-PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.*
-PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat.*
+define CSWgcc4core_postinstall
+#!/bin/sh
-## gcc4gfortran Definitions
-PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran
-PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*
-PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951
-PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+Error()
+{
+ echo "=====> postinstall Error: $$1" >&2
+ exit 1
+}
-## gcc4g++ Definitions
-PKGFILES_CSWgcc4g++ = .*/gcc4/bin/.*g\+\+
-PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+
-PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus
-PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libstdc.*
-PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libsupc\+\+.*
-PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*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.*
+OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
+case `/usr/bin/uname -p` in
+ "sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
+ "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
+esac
-## gcc4java Definitions
-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/man.*/gcj.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gij.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/jv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/jcf.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/grmi.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gorbd.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gapplet.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gkeytool.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gserialver.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gtnameserv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gnative2ascii.*
-PKGFILES_CSWgcc4java += .*/gcc4/man.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgij.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libffi.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*lib-gnu-awt.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*security/classpath.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*logging.properties
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*pkgconfig.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*gcj.*
-PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgcj.*
-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/.*
+TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
+TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(GARVERSION)/install-tools"
+MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
+INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
+INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(GARVERSION)/include"
-## gcc4objc Definitions
-PKGFILES_CSWgcc4objc = .*/gcc4/libexec/.*cc1obj
-PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*
-PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.*
-PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.*
+cat << _EOF_
+******************************************************************************
+* NOTICE: Fixing the system headers
+*
+* Do not forget: whenever your system headers change
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
-####### RunTime Packages
+if [ -f $${TOOLS_DIR}/mkheaders ]; then
+ cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
+ installf $${PKGINST} "$${MKHEADERS_CMD}"
+else
+ Error "$${TOOLS_DIR}/mkheaders Not Found"
+fi
-## gcc4adart
-PKGFILES_CSWgcc4adart = .*/opt/csw/lib/.*libgnat.*
-PKGFILES_CSWgcc4adart += .*/opt/csw/lib/.*libgnarl.*
+if [ -f $${MKHEADERS_CMD} ];then
+ chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
+ chown root:bin $${MKHEADERS_CMD} 2>/dev/null
+ "$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
+else
+ Error "Could not find $${MKHEADERS_CMD}"
+fi
-## gcc4corert
-PKGFILES_CSWgcc4corert = .*/opt/csw/lib/.*libgcc_s.*
-PKGFILES_CSWgcc4corert += .*/opt/csw/lib/.*libgomp.*
-PKGFILES_CSWgcc4corert += .*/opt/csw/lib/.*libssp.*
+if [ -d $${INCLUDE_DIR} ]; then
+ chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
+ chown -R root:bin $${INCLUDE_DIR} ||
+ Error "Failed to change ownership for $${INCLUDE_DIR}"
+ find $${INCLUDE_DIR} -print | installf $${PKGINST} -
+fi
-## gcc4gfortranrt
-PKGFILES_CSWgcc4gfortranrt = .*/opt/csw/lib/.*libgfortran.*
-## gcc4g++rt
-PKGFILES_CSWgcc4g++rt = .*/opt/csw/lib/.*libstdc.*
-PKGFILES_CSWgcc4g++rt += .*/opt/csw/lib/.*libsupc\+\+.*
+cat << _EOF_
+******************************************************************************
+* NOTICE: Successfully fixed system headers
+*
+* Do not forget: whenever your system headers change
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
+
+installf -f $${PKGINST}
-## gcc4javart
-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.*
+exit 0
+endef
-## gcc4objc Runtime
-PKGFILES_CSWgcc4objcrt = .*/opt/csw/lib/.*libobjc.*
Added: csw/mgar/pkg/gcc4/trunk/files/package_files.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_files.mk
(rev 0)
+++ csw/mgar/pkg/gcc4/trunk/files/package_files.mk 2009-04-16 14:16:56 UTC
(rev 4348)
@@ -0,0 +1,119 @@
+## Define the Contents of the Packages
+
+## gcc4ada Definitions
+PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1
+PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*a
+PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*a
+PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.*
+PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.*
+PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.*
+PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat.*
+
+## gcc4gfortran Definitions
+PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran
+PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*a
+PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951
+PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
+PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
+
+## gcc4g++ Definitions
+PKGFILES_CSWgcc4g++ = .*/gcc4/bin/.*g\+\+
+PKGFILES_CSWgcc4g++ += .*/gcc4/bin/.*c\+\+
+PKGFILES_CSWgcc4g++ += .*/gcc4/libexec/.*cc1plus
+PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libstdc.*a
+PKGFILES_CSWgcc4g++ += .*/gcc4/lib/.*libsupc\+\+.*a
+PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*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 = .*/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/man/.*/gcj.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.*
+PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.*
+PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgij.*a
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libffi.*a
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*lib-gnu-awt.*a
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*security.*
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*logging.properties
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*pkgconfig.*
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*gcj.*a
+PKGFILES_CSWgcc4java += .*/gcc4/lib/.*libgcj.*a
+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 = .*/gcc4/libexec/.*cc1obj
+PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*a
+PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.*
+PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.*
+
+####### RunTime Packages
+
+## gcc4adart
+PKGFILES_CSWgcc4adart = .*/gcc4/lib/.*libgnat.*\.so.*
+PKGFILES_CSWgcc4adart += .*/gcc4/lib/.*libgnarl.*\.so.*
+
+## gcc4corert
+PKGFILES_CSWgcc4corert = .*/gcc4/lib/.*libgcc_s.*\.so.*
+PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libgomp.*\.so.*
+PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libssp.*\.so.*
+
+## gcc4gfortranrt
+PKGFILES_CSWgcc4gfortranrt = .*/gcc4/lib/.*libgfortran.*\.so.*
+
+## gcc4g++rt
+PKGFILES_CSWgcc4g++rt = .*/gcc4/lib/.*libstdc.*\.so.*
+PKGFILES_CSWgcc4g++rt += .*/gcc4/lib/.*libsupc\+\+.*\.so.*
+
+## gcc4javart
+PKGFILES_CSWgcc4javart = .*/gcc4/lib/.*libgij.*\.so.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libffi.*\.so.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*lib-gnu-awt.*\.so.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*security/classpath.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*logging.properties
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*pkgconfig.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*gcj.*\.so.*
+PKGFILES_CSWgcc4javart += .*/gcc4/lib/.*libgcj.*\.so.*
+
+## gcc4objc Runtime
+PKGFILES_CSWgcc4objcrt = .*/gcc4/lib/.*libobjc.*\.so.*
Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-04-16 12:54:33 UTC
(rev 4347)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-04-16 14:16:56 UTC
(rev 4348)
@@ -1,55 +1,37 @@
+ifeq ($(PKG_DEBUG),)
+ _DBG=@
+else
+ _DBG=
+endif
-post-patch-modulated:
- @(echo "==> Running autoheader and autoconf")
- @(cd $(PATCHDIR)/gcc && autoheader)
- @(cd $(PATCHDIR)/gcc && autoconf)
- @$(MAKECOOKIE)
## Create $(OBJECT_DIR) to build in
post-extract-$(addprefix post-extract-,$(MODULATIONS)):
- @(echo "==> Creating Object Dir for Building")
- @( mkdir $(OBJECT_DIR) )
- $(MAKECOOKIE)
+ $(_DBG)(echo "==> Creating Object Dir for Building")
+ $(_DBG)(mkdir $(OBJECT_DIR))
+ $(_DBG)$(MAKECOOKIE)
## instead of changing to $(WORKSRC) and running configure
## Run it from the $(OBJECT_DIR)
configure-objdir:
- echo "==> Running Configure from $(OBJECT_DIR)"
- cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
- ../$(DISTNAME)/configure $(CONFIGURE_ARGS)
- $(MAKECOOKIE)
+ $(_DBG)(echo "==> Running Configure from $(OBJECT_DIR)")
+ $(_DBG)(cd $(OBJECT_DIR) && $(CONFIGURE_ENV) \
+ ../$(DISTNAME)/configure $(CONFIGURE_ARGS))
+ $(_DBG)$(MAKECOOKIE)
## Set the CFLAGS so the correct architecture is used
fix-bootflags:
- @(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \
+ $(_DBG)(perl -i -plne "s|^BOOT_CFLAGS.*|BOOT_CFLAGS= $(BOOT_CFLAGS)|" \
$(WORKSRC)/Makefile)
- @(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS= $(BOOT_LDFLAGS)|" \
+ $(_DBG)(perl -i -plne "s|^BOOT_LDFLAGS.*|BOOT_LDFLAGS=
$(BOOT_LDFLAGS)|" \
$(WORKSRC)/Makefile)
- @$(MAKECOOKIE)
+ $(_DBG)$(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)
+ $(_DBG)( gmv $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \
+ $(PKGROOT)/opt/csw/gcc4/lib/ )
+ $(_DBG)$(MAKECOOKIE)
test-skip:
- @$(MAKECOOKIE)
+ $(_DBG)$(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
