[csw-devel] SF.net SVN: gar:[11708] csw/mgar/pkg/libtool/branches/libtool24
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Nov 24 12:14:05 CET 2010
Revision: 11708
http://gar.svn.sourceforge.net/gar/?rev=11708&view=rev
Author: dmichelsen
Date: 2010-11-24 11:14:05 +0000 (Wed, 24 Nov 2010)
Log Message:
-----------
libtool/libtool24: Forward-port patches
Modified Paths:
--------------
csw/mgar/pkg/libtool/branches/libtool24/Makefile
Added Paths:
-----------
csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch
csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch
Removed Paths:
-------------
csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff
Modified: csw/mgar/pkg/libtool/branches/libtool24/Makefile
===================================================================
--- csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-24 09:48:46 UTC (rev 11707)
+++ csw/mgar/pkg/libtool/branches/libtool24/Makefile 2010-11-24 11:14:05 UTC (rev 11708)
@@ -21,11 +21,13 @@
MASTER_SITES = $(GNU_MIRROR)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.xz
-PATCH_LIBTOOL = patch-libtool.diff
-PATCHFILES_POSTINSTALL_isa-i386-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL)
-PATCHFILES_POSTINSTALL_isa-sparcv8-garversion-2.4-garcompiler-SOS12 = $(PATCH_LIBTOOL)
+PATCH_LIBTOOL = 0002-Forward-port-GCC-tags-patch.patch
+PATCHFILES_POSTINSTALL_isa-i386-garcompiler-SOS12 = $(PATCH_LIBTOOL)
+PATCHFILES_POSTINSTALL_isa-sparcv8-garcompiler-SOS12 = $(PATCH_LIBTOOL)
DISTFILES += $(PATCH_LIBTOOL)
+PATCHFILES = 0001-Preserve-norunpath.patch
+
EXTRA_TAGS = gcc3 gcc4 sos12
COMPILER_TAGNAME_GCC3 = gcc3
COMPILER_TAGNAME_GCC4 = gcc4
Added: csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch
===================================================================
--- csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch (rev 0)
+++ csw/mgar/pkg/libtool/branches/libtool24/files/0001-Preserve-norunpath.patch 2010-11-24 11:14:05 UTC (rev 11708)
@@ -0,0 +1,33 @@
+From 61f2e8e198520e36e898b2c52e06abfa1f2e0f3b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 24 Nov 2010 10:45:07 +0100
+Subject: [PATCH] Preserve -norunpath
+
+---
+ libltdl/config/ltmain.m4sh | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+index 0418007..9792193 100644
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -5040,6 +5040,7 @@ func_mode_link ()
+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+ # -r[0-9][0-9]* specify processor for the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
++ # -norunpath, -xnorunpath do not include compiler path in RPATH
+ # +DA*, +DD* enable 64-bit mode for the HP compiler
+ # -q* compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+@@ -5051,7 +5052,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath|-xnorunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.7.1
+
Copied: csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch (from rev 11703, csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff)
===================================================================
--- csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch (rev 0)
+++ csw/mgar/pkg/libtool/branches/libtool24/files/0002-Forward-port-GCC-tags-patch.patch 2010-11-24 11:14:05 UTC (rev 11708)
@@ -0,0 +1,85 @@
+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
+ # positional parameter $0, within a function call, is the name of the
+ # function.
+ progpath="$0"
++confpath="$0"
++tagspath="$0"
+
+
+
+@@ -1347,11 +1349,11 @@ func_config ()
+ re_endcf='^# ### END LIBTOOL'
+
+ # Default configuration.
+- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
++ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath"
+
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
++ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath"
+ done
+
+ exit $?
+@@ -1401,14 +1403,14 @@ func_enable_tag ()
+ case $tagname in
+ CC) ;;
+ *)
+- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
++ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
++ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+@@ -1609,6 +1611,16 @@ func_enable_tag "$optarg"
+
+ # 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/share/libtool/gcc4.conf
++ tagspath=/opt/csw/share/libtool/gcc4.tags
++ ;;
++ esac
+ nonopt="$opt"
+ shift
+ fi
+@@ -1828,9 +1840,9 @@ func_infer_tag ()
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+--
+1.7.3
+
Deleted: csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff
===================================================================
--- csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff 2010-11-24 09:48:46 UTC (rev 11707)
+++ csw/mgar/pkg/libtool/branches/libtool24/files/patch-libtool.diff 2010-11-24 11:14:05 UTC (rev 11708)
@@ -1,78 +0,0 @@
-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
-@@ -682,6 +682,8 @@
- # positional parameter $0, within a function call, is the name of the
- # function.
- progpath="$0"
-+confpath="$0"
-+tagspath="$0"
-
- # The name of this program:
- # In the unlikely event $progname began with a '-', it would play havoc with
-@@ -1128,11 +1130,11 @@
- re_endcf='^# ### END LIBTOOL'
-
- # Default configuration.
-- $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$confpath"
-
- # Now print the configurations for the tags.
- for tagname in $taglist; do
-- $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$tagspath"
- done
-
- exit $?
-@@ -1182,14 +1184,14 @@
- case $tagname in
- CC) ;;
- *)
-- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-+ if $GREP "$re_begincf" "$tagspath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
-- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-+ extractedcf=`$SED -n -e "$sed_extractcf" < "$tagspath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
-@@ -1303,7 +1305,21 @@
-
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
-
-- *) nonopt="$opt"
-+ *) 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/share/libtool/gcc4.conf
-+ tagspath=/opt/csw/share/libtool/gcc4.tags
-+ ;;
-+ esac
-+
-+
-+
-+
-+nonopt="$opt"
- break
- ;;
- esac
-@@ -1530,9 +1546,9 @@
- # if we don't check for them as well.
- *)
- for z in $available_tags; do
-- if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$tagspath" > /dev/null; then
- # Evaluate the configuration.
-- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $tagspath`"
- CC_quoted=
- for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
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