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

[valholla at users.sourceforge.net]

Revision: 4746
          http://gar.svn.sourceforge.net/gar/?rev=4746&view=rev
Author:   valholla
Date:     2009-05-07 19:37:48 +0000 (Thu, 07 May 2009)

Log Message:
-----------
fix missing links in lib, both sparc and x86

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/files/amd_merge.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	2009-05-07 19:25:50 UTC (rev 4745)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-05-07 19:37:48 UTC (rev 4746)
@@ -60,7 +60,6 @@
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/share $(PKGROOT))
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib $(PKGROOT))
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/libexec $(PKGROOT))
-	$(_DBG)(cd $(PPREFIX)/lib; gln . 32)
 	$(_DBG)$(MAKECOOKIE)
 
 merge-amd64-files:
@@ -70,7 +69,6 @@
 		/usr/bin/pax -rw -v $$dir $(PKGROOT); done )
 	$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib/amd64 $(PKGROOT))
 	$(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/amd64)
-	$(_DBG)(cd $(PPREFIX)/lib; gln amd64 64)
 	$(_DBG)$(MAKECOOKIE)
 
 ifeq ($(shell uname -p), i386)

Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-05-07 19:25:50 UTC (rev 4745)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-05-07 19:37:48 UTC (rev 4746)
@@ -31,6 +31,12 @@
 	$(_DBG)( gmv $(PKGROOT)/opt/csw/gcc4/lib/gcc/*/*/adalib/*.so* \
 			$(PKGROOT)/opt/csw/gcc4/lib/ )
 	$(_DBG)( gfind $(PKGROOT) -name \*~ -exec grm -f {} \; )
+	$(_DBG)( cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s . 32 )
+	$(_DBG)(if [ "`uname -p`" = "sparc" ]; then \
+				cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s sparcv9 64; \
+			else \
+				cd $(PKGROOT)/opt/csw/gcc4/lib; gln -s amd64 64; \
+			fi )
 	$(_DBG)$(MAKECOOKIE)
 
 test-skip:


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