[csw-devel] SF.net SVN: gar:[4115] csw/mgar/pkg/gcc4/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Tue Mar 31 20:36:01 CEST 2009
Revision: 4115
http://gar.svn.sourceforge.net/gar/?rev=4115&view=rev
Author: valholla
Date: 2009-03-31 18:36:01 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
final checkin before package
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/Makefile
csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-31 17:25:07 UTC (rev 4114)
+++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-31 18:36:01 UTC (rev 4115)
@@ -44,9 +44,12 @@
CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
## For cleanliness I split the Configuration into separate files
+ifeq ($(shell uname -p), i386)
+ISAEXEC_DIRS = /opt/csw/gcc4/bin
+endif
+include files/amd_merge.mk
include files/gar_override.mk
+include files/package_def.mk
include files/pkg_scripts.mk
-include files/amd_merge.mk
-include files/package_def.mk
## include mGar definitions
include gar/category.mk
Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-31 17:25:07 UTC (rev 4114)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-31 18:36:01 UTC (rev 4115)
@@ -1,4 +1,3 @@
-AMD_DEBUG = 1
ifeq ($(AMD_DEBUG),)
_DBG=@
@@ -6,6 +5,9 @@
_DBG=
endif
+pre-package:
+ echo $(ISAEXEC_FILES_isa-i386)
+
AMD_BASE = $(WORKROOTDIR)/install-isa-i386-5.10-i386/
I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8-i386/
MPREFIX = opt/csw/gcc4
@@ -28,7 +30,7 @@
$(_DBG)$(MAKECOOKIE)
merge-amd64-files:
- @echo "[===== Merging isa-amd64: $(foreach M,$(MODULATORS),$M=$($M)) =====]"
+ @echo "[===== Merging isa-amd64 =====]"
$(_DBG)(cd $(AMD_BASE); for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \
/usr/bin/pax -rw $$dir $(PKGROOT); done )
$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
@@ -36,7 +38,7 @@
$(_DBG)$(MAKECOOKIE)
merge-i386-files:
- @echo "[===== Merging isa-i386: $(foreach M,$(MODULATORS),$M=$($M)) =====]"
+ @echo "[===== Merging isa-i386 =====]"
$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/bin $(PKGROOT))
$(_DBG)(gmv -f $(PPREFIX)/bin/i386-pc* $(PPREFIX)/bin/i386/)
$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/include $(PKGROOT))
@@ -54,31 +56,31 @@
$(_DBG)(stripbin $(PPREFIX)/bin)
$(_DBG)$(MAKECOOKIE)
-ISAEXEC_DIRS = /opt/csw/gcc4/bin
-ISAEXEC_FILES_i386 = /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gtnameserv
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcc
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcov
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gccbug
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gfortran
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/c++
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/g++
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/cpp
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/addr2name.awk
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gc-analyze
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcjh
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjarsigner
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmic
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjavah
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmid
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/jcf-dump
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gkeytool
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmiregistry
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/jv-convert
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcj
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gij
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gnative2ascii
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gserialver
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gappletviewer
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcj-dbtool
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjar
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gorbd
+ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gtnameserv
+
Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-31 17:25:07 UTC (rev 4114)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-31 18:36:01 UTC (rev 4115)
@@ -36,7 +36,8 @@
export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS
export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS
-FIXCONFIG_DIRS = $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
+FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
+STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
CONFIGURE_SCRIPTS = objdir
TEST_SCRIPTS = skip
Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-31 17:25:07 UTC (rev 4114)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-31 18:36:01 UTC (rev 4115)
@@ -1,6 +1,4 @@
-DEBUG_PACKAGING = 1
-
post-patch-modulated:
@(echo "==> Running autoheader and autoconf")
@(cd $(PATCHDIR)/gcc && autoheader)
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