[csw-devel] SF.net SVN: gar:[15317] csw/mgar/pkg/gcc4/trunk/files
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Thu Aug 11 22:48:35 CEST 2011
Revision: 15317
http://gar.svn.sourceforge.net/gar/?rev=15317&view=rev
Author: wahwah
Date: 2011-08-11 20:48:35 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
pkg/gcc4/trunk: removing hardcoded /opt/csw in many places
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 2011-08-11 20:25:55 UTC (rev 15316)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2011-08-11 20:48:35 UTC (rev 15317)
@@ -72,45 +72,45 @@
$(_DBG)$(MAKECOOKIE)
ifeq ($(shell uname -p), i386)
-ISAEXEC_DIRS = /opt/csw/gcc4/bin
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES += /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES += /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnat
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatls
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatname
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatmake
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatclean
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatkr
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbind
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatbl
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatchop
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatfind
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatxref
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatprep
-ISAEXEC_FILES += /opt/csw/gcc4/bin/gnatlink
+ISAEXEC_DIRS = $(bindir)
+ISAEXEC_FILES += $(bindir)/gcc
+ISAEXEC_FILES += $(bindir)/gcov
+ISAEXEC_FILES += $(bindir)/gccbug
+ISAEXEC_FILES += $(bindir)/gfortran
+ISAEXEC_FILES += $(bindir)/c++
+ISAEXEC_FILES += $(bindir)/g++
+ISAEXEC_FILES += $(bindir)/cpp
+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)/gjavah
+ISAEXEC_FILES += $(bindir)/grmid
+ISAEXEC_FILES += $(bindir)/jcf-dump
+ISAEXEC_FILES += $(bindir)/gkeytool
+ISAEXEC_FILES += $(bindir)/grmiregistry
+ISAEXEC_FILES += $(bindir)/jv-convert
+ISAEXEC_FILES += $(bindir)/gcj
+ISAEXEC_FILES += $(bindir)/gij
+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
+ISAEXEC_FILES += $(bindir)/gnative2ascii
+ISAEXEC_FILES += $(bindir)/gnat
+ISAEXEC_FILES += $(bindir)/gnatls
+ISAEXEC_FILES += $(bindir)/gnatname
+ISAEXEC_FILES += $(bindir)/gnatmake
+ISAEXEC_FILES += $(bindir)/gnatclean
+ISAEXEC_FILES += $(bindir)/gnatkr
+ISAEXEC_FILES += $(bindir)/gnatbind
+ISAEXEC_FILES += $(bindir)/gnatbl
+ISAEXEC_FILES += $(bindir)/gnatchop
+ISAEXEC_FILES += $(bindir)/gnatfind
+ISAEXEC_FILES += $(bindir)/gnatxref
+ISAEXEC_FILES += $(bindir)/gnatprep
+ISAEXEC_FILES += $(bindir)/gnatlink
endif
Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-11 20:25:55 UTC (rev 15316)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2011-08-11 20:48:35 UTC (rev 15317)
@@ -8,7 +8,7 @@
WORKSRC = $(OBJECT_DIR)
DIRPATHS =
OPTFLAGS =
-CONFIG_SHELL = /bin/bash
+CONFIG_SHELL = /opt/csw/bin/bash
GARCOMPILER = GCC3
GCC3_CC = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe
CFLAGS = -I/opt/csw/include
Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 20:25:55 UTC (rev 15316)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2011-08-11 20:48:35 UTC (rev 15317)
@@ -2,67 +2,74 @@
PACKAGES = CSWgcc4ada
CATALOGNAME_CSWgcc4ada = gcc4ada
SPKG_DESC_CSWgcc4ada = GNU C ADA Compiler
-RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart CSWiconv CSWlibgmp CSWlibmpfr
-PKGFILES_CSWgcc4ada = .*/gcc4/libexec/.*gnat1
-PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnat.*a
-PKGFILES_CSWgcc4ada += .*/gcc4/lib/.*libgnarl.*a
+PKGFILES_CSWgcc4ada = $(libexecdir)/.*gnat1
+PKGFILES_CSWgcc4ada += $(libdir)/.*libgnat.*a
+PKGFILES_CSWgcc4ada += $(libdir)/.*libgnarl.*a
PKGFILES_CSWgcc4ada += .*/gcc4/.*/adalib/.*
PKGFILES_CSWgcc4ada += .*/gcc4/.*/adainclude/.*
PKGFILES_CSWgcc4ada += .*/gcc4/info/.*gnat.*
-PKGFILES_CSWgcc4ada += .*/gcc4/bin/gnat(?!ive).*
-## gcc4adart
-PKGFILES_CSWgcc4adart = .*/gcc4/lib/.*libgnat.*\.so.*
-PKGFILES_CSWgcc4adart += .*/gcc4/lib/.*libgnarl.*\.so.*
+PKGFILES_CSWgcc4ada += $(bindir)/gnat(?!ive).*
+RUNTIME_DEP_PKGS_CSWgcc4ada = CSWgcc4adart
+RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10
PACKAGES += CSWgcc4adart
CATALOGNAME_CSWgcc4adart = gcc4adart
SPKG_DESC_CSWgcc4adart = GNU C ADA Compiler Run Time
+PKGFILES_CSWgcc4adart = $(libdir)/.*libgnat.*\.so.*
+PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
RUNTIME_DEP_PKGS_CSWgcc4adart = CSWgcc4corert
PACKAGES += CSWgcc4core
CATALOGNAME_CSWgcc4core = gcc4core
SPKG_DESC_CSWgcc4core = GNU C Compiler
-RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils CSWiconv
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp CSWlibmpfr
-# Catch-all package
+RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
PACKAGES += CSWgcc4corert
CATALOGNAME_CSWgcc4corert = gcc4corert
SPKG_DESC_CSWgcc4corert = GNU C Compiler Run Time
-## gcc4corert
-PKGFILES_CSWgcc4corert = .*/gcc4/lib/.*libgcc_s.*\.so.*
-PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libgomp.*\.so.*
-PKGFILES_CSWgcc4corert += .*/gcc4/lib/.*libssp.*\.so.*
+PKGFILES_CSWgcc4corert = $(libdir)/.*libgcc_s.*\.so.*
+PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
+PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
PACKAGES += CSWgcc4g++
-CATALOGNAME_CSWgcc4g++ = gcc4g++
-SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt CSWiconv CSWlibgmp CSWlibmpfr
-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
+CATALOGNAME_CSWgcc4g++ = gcc4g++
+SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
+PKGFILES_CSWgcc4g++ = $(bindir)/.*g\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+
+PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
+PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
+PKGFILES_CSWgcc4g++ += $(libdir)/.*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.*
+PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
+PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
+RUNTIME_DEP_PKGS_CSWgcc4g++ = CSWgcc4g++rt
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
PACKAGES += CSWgcc4g++rt
-CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
-SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
-PKGFILES_CSWgcc4g++rt = .*/gcc4/lib/.*libstdc.*\.so.*
-PKGFILES_CSWgcc4g++rt += .*/gcc4/lib/.*libsupc\+\+.*\.so.*
+CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
+SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
+RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
+PKGFILES_CSWgcc4g++rt = $(libdir)/.*libstdc.*\.so.*
+PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
PACKAGES += CSWgcc4gfortran
CATALOGNAME_CSWgcc4gfortran = gcc4gfortran
SPKG_DESC_CSWgcc4gfortran = GNU Fortran Compiler
-RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt CSWiconv CSWlibgmp
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr
-PKGFILES_CSWgcc4gfortran = .*/gcc4/bin/.*gfortran
-PKGFILES_CSWgcc4gfortran += .*/gcc4/lib/.*libgfortran.*a
-PKGFILES_CSWgcc4gfortran += .*/gcc4/libexec/.*f951
+RUNTIME_DEP_PKGS_CSWgcc4gfortran = CSWgcc4gfortranrt
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
+PKGFILES_CSWgcc4gfortran = $(bindir)/.*gfortran
+PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
+PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
@@ -70,32 +77,36 @@
CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
RUNTIME_DEP_PKGS_CSWgcc4gfortranrt = CSWgcc4corert
-PKGFILES_CSWgcc4gfortranrt = .*/gcc4/lib/.*libgfortran.*\.so.*
+PKGFILES_CSWgcc4gfortranrt = $(libdir)/.*libgfortran.*\.so.*
PACKAGES += CSWgcc4java
CATALOGNAME_CSWgcc4java = gcc4java
SPKG_DESC_CSWgcc4java = GNU Java Compiler
RUNTIME_DEP_PKGS_CSWgcc4java = CSWgcc4corert CSWgcc4javart
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib CSWiconv CSWlibgmp CSWlibmpfr
-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
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
+
+PKGFILES_CSWgcc4java = $(bindir)/.*gcj.*
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
+PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
+PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
+PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
+PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
+PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
+PKGFILES_CSWgcc4java += $(bindir)/.*gij
+PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
+PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
+PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
+PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
+PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
+PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
+PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
+PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
+PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
+PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
+PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.*
PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.*
PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.*
@@ -112,52 +123,56 @@
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 += $(libdir)/.*libgij.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*security.*
+PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties
+PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.*
+PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a
+PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a
+PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
+PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
+PKGFILES_CSWgcc4java += $(libexecdir)/.*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/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
+PKGFILES_CSWgcc4java += $(includedir)/.*java.*
+PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
+PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
PACKAGES += CSWgcc4javart
CATALOGNAME_CSWgcc4javart = gcc4javart
SPKG_DESC_CSWgcc4javart = GNU Java Compiler Run Time
RUNTIME_DEP_PKGS_CSWgcc4javart = CSWgcc4corert CSWgcc4g++rt
-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.*
+PKGFILES_CSWgcc4javart = $(libdir)/.*libgij.*\.so.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
+PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
+PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
PACKAGES += CSWgcc4objc
CATALOGNAME_CSWgcc4objc = gcc4objc
SPKG_DESC_CSWgcc4objc = GNU Objective C Compiler
-RUNTIME_DEP_PKGS_CSWgcc4objc = CSWgcc4objcrt CSWiconv CSWlibgmp CSWlibmpfr
-PKGFILES_CSWgcc4objc = .*/gcc4/libexec/.*cc1obj
-PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*libobjc.*a
-PKGFILES_CSWgcc4objc += .*/gcc4/include/.*objc/.*
-PKGFILES_CSWgcc4objc += .*/gcc4/lib/.*/include/objc/.*
+PKGFILES_CSWgcc4objc = $(libexecdir)/.*cc1obj
+PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a
+PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.*
+PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWgcc4objcrt
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
+
PACKAGES += CSWgcc4objcrt
CATALOGNAME_CSWgcc4objcrt = gcc4objcrt
SPKG_DESC_CSWgcc4objcrt = GNU Objective C Compiler Run Time
RUNTIME_DEP_PKGS_CSWgcc4objcrt = CSWgcc4corert
-PKGFILES_CSWgcc4objcrt = .*/gcc4/lib/.*libobjc.*\.so.*
+PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
## Source URLs
VENDOR_URL = http://gcc.gnu.org
Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-11 20:25:55 UTC (rev 15316)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2011-08-11 20:48:35 UTC (rev 15317)
@@ -28,14 +28,14 @@
$(_DBG)$(MAKECOOKIE)
post-merge-modulated:
- $(_DBG)( gmv $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \
- $(PKGROOT)/opt/csw/gcc4/lib/ )
+ $(_DBG)( gmv $(PKGROOT)$(libdir)/gcc/*/*/adalib/*.so* \
+ $(PKGROOT)$(libdir)/ )
$(_DBG)( gfind $(PKGROOT) -name \*~ -exec grm -f {} \; )
- $(_DBG)( cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s . 32 )
+ $(_DBG)( cd $(PKGROOT)$(libdir); gln -s . 32 )
$(_DBG)(if [ "`uname -p`" = "sparc" ]; then \
- cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s sparcv9 64; \
+ cd $(PKGROOT)$(libdir); gln -s sparcv9 64; \
else \
- cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s amd64 64; \
+ cd $(PKGROOT)$(libdir); gln -s amd64 64; \
fi )
$(_DBG)$(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