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

[valholla at users.sourceforge.net]

Revision: 4620
          http://gar.svn.sourceforge.net/gar/?rev=4620&view=rev
Author:   valholla
Date:     2009-04-30 15:33:19 +0000 (Thu, 30 Apr 2009)

Log Message:
-----------
add new target to amd_merge.mk

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile
    csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2009-04-30 15:00:05 UTC (rev 4619)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2009-04-30 15:33:19 UTC (rev 4620)
@@ -38,11 +38,9 @@
 CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
 
 ## For cleanliness I split the Configuration into separate files
-#include files/amd_merge.mk
 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/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-30 15:00:05 UTC (rev 4619)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-30 15:33:19 UTC (rev 4620)
@@ -12,6 +12,7 @@
 PPREFIX   = $(PKGROOT)/$(MPREFIX)
 
 AMD_MERGE_TARGETS  = merge-dirs-amd
+AMD_MERGE_TARGETS += merge-fix-links
 AMD_MERGE_TARGETS += merge-i386-files
 AMD_MERGE_TARGETS += merge-amd64-files
 
@@ -24,10 +25,36 @@
 	$(_DBG)(ginstall -d $(PPREFIX)/bin/i386)
 	$(_DBG)$(MAKECOOKIE)
 
+## Remove the Hard Links and re-create as files
+merge-fix-links:
+	@echo "[===== Merging Fixing Hard Links =====]"
+	$(_DBG)(cd $(IPREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran)
+	$(_DBG)(cd $(IPREFIX)/bin; \
+		gcp sparc-sun-solaris2.8-gcc-4.3.3 sparc-sun-solaris2.8-gcc)
+	$(_DBG)(cd $(IPREFIX)/bin; gcp sparc-sun-solaris2.8-gcc-4.3.3 gcc)
+	$(_DBG)(cd $(IPREFIX)/bin; \
+		gcp sparc-sun-solaris2.8-g++ sparc-sun-solaris2.8-c++)
+	$(_DBG)(cd $(IPREFIX)/bin; gcp sparc-sun-solaris2.8-g++ g++)
+	$(_DBG)(cd $(IPREFIX)/bin; gcp sparc-sun-solaris2.8-g++ c++)
+	$(_DBG)(cd $(IPREFIX)/bin; gcp sparc-sun-solaris2.8-gcj gcj)
+	$(_DBG)(cd $(IPREFIX)/bin; gcp sparc-sun-solaris2.8-gfortran gfortran)
+	$(_DBG)(cd $(APREFIX)/bin; grm -f *gcc *c++ g++ gcj gfortran)
+	$(_DBG)(cd $(APREFIX)/bin; \
+		gcp sparc-sun-solaris2.8-gcc-4.3.3 sparc-sun-solaris2.8-gcc)
+	$(_DBG)(cd $(APREFIX)/bin; gcp sparc-sun-solaris2.8-gcc-4.3.3 gcc)
+	$(_DBG)(cd $(APREFIX)/bin; \
+		gcp sparc-sun-solaris2.8-g++ sparc-sun-solaris2.8-c++)
+	$(_DBG)(cd $(APREFIX)/bin; gcp sparc-sun-solaris2.8-g++ g++)
+	$(_DBG)(cd $(APREFIX)/bin; gcp sparc-sun-solaris2.8-g++ c++)
+	$(_DBG)(cd $(APREFIX)/bin; gcp sparc-sun-solaris2.8-gcj gcj)
+	$(_DBG)(cd $(APREFIX)/bin; gcp sparc-sun-solaris2.8-gfortran gfortran)
+	$(_DBG)$(MAKECOOKIE)
+
 merge-i386-files:
 	@echo "[===== Merging isa-i386 =====]"
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/bin $(PKGROOT))
-	$(_DBG)(cd $(IPREFIX)/bin; /usr/bin/pax -rw -v *solaris2* $(PPREFIX)/bin/amd64)
+	$(_DBG)(cd $(IPREFIX)/bin; \
+			/usr/bin/pax -rw -v *solaris2* $(PPREFIX)/bin/i386)
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/include $(PKGROOT))
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/info $(PKGROOT))
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/man $(PKGROOT))


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