SF.net SVN: gar:[22551] csw/mgar/pkg/libtool/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22551
          http://gar.svn.sourceforge.net/gar/?rev=22551&view=rev
Author:   dmichelsen
Date:     2013-11-18 13:33:08 +0000 (Mon, 18 Nov 2013)
Log Message:
-----------
libtool/trunk: Move from gcc 4.6 to 4.8, drop support for gcc 4.6

Modified Paths:
--------------
    csw/mgar/pkg/libtool/trunk/Makefile
    csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch

Modified: csw/mgar/pkg/libtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtool/trunk/Makefile	2013-11-18 11:18:28 UTC (rev 22550)
+++ csw/mgar/pkg/libtool/trunk/Makefile	2013-11-18 13:33:08 UTC (rev 22551)
@@ -3,7 +3,8 @@
 GARTYPE = v2
 
 EXTRA_MODULATORS = GARCOMPILER
-MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12
+#MODULATIONS_GARCOMPILER = GCC3 GCC4 SOS12
+MODULATIONS_GARCOMPILER = GCC4 SOS12
 
 # Modulate over compiler only for 2.4
 # Compile 64 bit libraries only with SOS12
@@ -22,12 +23,13 @@
 
 PATCH_LIBTOOL = 0002-Forward-port-GCC-tags-patch.patch
 PATCHFILES_POSTINSTALL_isa-pentium_pro-garcompiler-SOS12 = $(PATCH_LIBTOOL)
-PATCHFILES_POSTINSTALL_isa-sparcv8-garcompiler-SOS12 = $(PATCH_LIBTOOL)
+PATCHFILES_POSTINSTALL_isa-sparcv8plus-garcompiler-SOS12 = $(PATCH_LIBTOOL)
 DISTFILES += $(PATCH_LIBTOOL)
 
 PATCHFILES  = 0001-Preserve-norunpath.patch
 
-EXTRA_TAGS = gcc3 gcc4 sos12
+#EXTRA_TAGS = gcc3 gcc4 sos12
+EXTRA_TAGS = gcc4 sos12
 COMPILER_TAGNAME_GCC3 = gcc3
 COMPILER_TAGNAME_GCC4 = gcc4
 COMPILER_TAGNAME_SOS12 = sos12
@@ -88,7 +90,7 @@
 	@$(MAKECOOKIE)
 
 patch-libtool:
-	-cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch --forward -p1)
+	-cat $(WORKDIR)/$(PATCHFILES_POSTINSTALL_$(MODULATION)) | (cd $(DESTDIR)$(bindir) && gpatch --forward -p0)
 	# Remove arch-specific flags from the libtool-compilation so they don't spoil the target build
 	# Instead we inherit from CFLAGS as removing the arch specified leads to the default arch which
 	# may very well be wrong (especially on sparc default is v8+ instead of the requested default v8

Modified: csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch
===================================================================
--- csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch	2013-11-18 11:18:28 UTC (rev 22550)
+++ csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch	2013-11-18 13:33:08 UTC (rev 22551)
@@ -1,17 +1,6 @@
-From 184e7e0619ef31887fc1986e368d48f0a3677b6b Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 24 Nov 2010 11:15:29 +0100
-Subject: [PATCH] Forward-port GCC tags patch
-
----
- libtool |   24 ++++++++++++++++++------
- 1 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/libtool b/libtool
-index 4539216..8ac45c1 100755
---- a/libtool
-+++ b/libtool
-@@ -576,6 +576,8 @@ $lt_unset CDPATH
+--- libtool	2013-11-18 14:15:21.212825370 +0100
++++ libtool.new	2013-11-18 14:18:36.734017047 +0100
+@@ -576,6 +576,8 @@
  # positional parameter $0, within a function call, is the name of the
  # function.
  progpath="$0"
@@ -20,7 +9,7 @@
  
  
  
-@@ -1347,11 +1349,11 @@ func_config ()
+@@ -1342,11 +1344,11 @@
      re_endcf='^# ### END LIBTOOL'
  
      # Default configuration.
@@ -34,7 +23,7 @@
      done
  
      exit $?
-@@ -1401,14 +1403,14 @@ func_enable_tag ()
+@@ -1396,14 +1398,14 @@
    case $tagname in
      CC) ;;
      *)
@@ -51,16 +40,12 @@
  	eval "$extractedcf"
        else
  	func_error "ignoring unknown tag $tagname"
-@@ -1609,6 +1611,16 @@ func_enable_tag "$optarg"
+@@ -1609,6 +1611,12 @@
  
    # save first non-option argument
    if test "$#" -gt 0; then
 +    case `which "$opt"` in
-+      /opt/csw/gcc3/bin/*)
-+        . /opt/csw/share/libtool/gcc3.conf
-+        tagspath=/opt/csw/share/libtool/gcc3.tags
-+        ;;
-+      /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/gcc-4.6)
++      /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/g++|/opt/csw/bin/gcc-4.8|/opt/csw/bin/g++-4.8)
 +        . /opt/csw/share/libtool/gcc4.conf
 +        tagspath=/opt/csw/share/libtool/gcc4.tags
 +        ;;
@@ -68,7 +53,7 @@
      nonopt="$opt"
      shift
    fi
-@@ -1828,9 +1840,9 @@ func_infer_tag ()
+@@ -1828,9 +1836,9 @@
        # if we don't check for them as well.
        *)
  	for z in $available_tags; do
@@ -80,6 +65,3 @@
  	    CC_quoted=
  	    for arg in $CC; do
  	      # Double-quote args containing other shell metacharacters.
--- 
-1.7.3
-

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