[csw-devel] SF.net SVN: gar:[6170] csw/mgar/pkg/libtool/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Sep 4 11:48:26 CEST 2009


Revision: 6170
          http://gar.svn.sourceforge.net/gar/?rev=6170&view=rev
Author:   dmichelsen
Date:     2009-09-04 09:48:26 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
libtool: Do some patching dynamically due to differences in flags between archs

Modified Paths:
--------------
    csw/mgar/pkg/libtool/trunk/Makefile
    csw/mgar/pkg/libtool/trunk/checksums
    csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff

Modified: csw/mgar/pkg/libtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2009-09-04 07:53:42 UTC (rev 6169)
+++ csw/mgar/pkg/libtool/trunk/Makefile	2009-09-04 09:48:26 UTC (rev 6170)
@@ -9,6 +9,8 @@
 
 # Modulate over compiler only for 2.2.6
 SKIP_MODULATIONS = $(foreach I,sparcv8 sparcv9 i386 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-1.5.26-garcompiler-$C))
+# Compile 64 bit libraries only with SOS11
+SKIP_MODULATIONS += $(foreach I,sparcv9 amd64,$(foreach C,GCC3 GCC4,isa-$I-garversion-2.2.6-garcompiler-$C))
 
 FILEVERSION_1.5.26 = 1.5.26
 FILEVERSION_2.2.6 = 2.2.6$(RELEASE)
@@ -91,6 +93,8 @@
 
 patch-libtool:
 	cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch -p1)
+	# Remove arch-specific flags from the libtool-compilation so they don't spoil the target build
+	perl -pi -e 's/^LTCFLAGS=.*/LTCFLAGS="-O"/' $(DESTDIR)$(bindir)/libtool
 
 install-libtool-%:
 	perl -ane 'print if( /^available_tags/ ); $$p = 1 if( /^# ### BEGIN LIBTOOL CONFIG/ ); print if( $$p ); $$p = 0 if( /^# ### END LIBTOOL CONFIG/ )' \

Modified: csw/mgar/pkg/libtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums	2009-09-04 07:53:42 UTC (rev 6169)
+++ csw/mgar/pkg/libtool/trunk/checksums	2009-09-04 09:48:26 UTC (rev 6170)
@@ -1,3 +1,3 @@
 aa9c5107f3ec9ef4200eb6556f3b3c29  download/libtool-1.5.26.tar.gz
 8ca1ea241cd27ff9832e045fe9afe4fd  download/libtool-2.2.6a.tar.gz
-7fb6410a02f5fd74aa3696a65ba434e2  download/patch-libtool.diff
+92bb3c7712498b6a5993ab5d5fc8f077  download/patch-libtool.diff

Modified: csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff
===================================================================
--- csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff	2009-09-04 07:53:42 UTC (rev 6169)
+++ csw/mgar/pkg/libtool/trunk/files/patch-libtool.diff	2009-09-04 09:48:26 UTC (rev 6170)
@@ -1,15 +1,6 @@
 diff -Naur lt-orig/libtool lt-patched/libtool
 --- lt-orig/libtool	2009-09-03 20:43:39.235079615 +0200
 +++ lt-patched/libtool	2009-09-03 20:56:11.509318512 +0200
-@@ -138,7 +138,7 @@
- LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/include"
-+LTCFLAGS="-O"
- 
- # Take the output of nm and produce a listing of raw symbols and C names.
- global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([BDRT][BDRT]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
 @@ -682,6 +682,8 @@
  # positional parameter $0, within a function call, is the name of the
  # function.


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