SF.net SVN: gar:[24618] csw/mgar/pkg/libtool/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Feb 5 16:30:28 CET 2015
Revision: 24618
http://sourceforge.net/p/gar/code/24618
Author: dmichelsen
Date: 2015-02-05 15:30:27 +0000 (Thu, 05 Feb 2015)
Log Message:
-----------
libtool/trunk: Update to 2.4.5, forward-port patches
Modified Paths:
--------------
csw/mgar/pkg/libtool/trunk/Makefile
csw/mgar/pkg/libtool/trunk/checksums
csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch
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 2015-02-04 16:29:01 UTC (rev 24617)
+++ csw/mgar/pkg/libtool/trunk/Makefile 2015-02-05 15:30:27 UTC (rev 24618)
@@ -1,5 +1,5 @@
NAME = libtool
-VERSION = 2.4.2
+VERSION = 2.4.5
GARTYPE = v2
EXTRA_MODULATORS = GARCOMPILER
@@ -51,16 +51,10 @@
# auto-enable this as a simple replacement.
CHECKPKG_OVERRIDES_CSWlibtool += file-with-bad-content
-# This is built from pkgs/libltdl3
-FOREIGN_PACKAGES += CSWlibltdl3
-OBSOLETED_BY_CSWlibltdl3 += CSWlibtoolrt
-CATALOGNAME_CSWlibtoolrt = libtool_rt_stub
-
PACKAGES += CSWlibltdl7
CATALOGNAME_CSWlibltdl7 = libltdl7
SPKG_DESC_CSWlibltdl7 = Libtool libltdl.so.7 from libtool 2.x
-PKGFILES_CSWlibltdl7 += $(PKGFILES_RT)
-OBSOLETED_BY_CSWlibltdl7 += CSWlibtoolrt
+PKGFILES_CSWlibltdl7 += $(call pkgfiles_lib,libltdl.so.7)
# To get around __sync_fetch_and_add_4 either the buildlevel could be raised to Solaris 10
# which is not acceptable for libtool or the base ISA could be raised to pentium_pro allowing
@@ -71,8 +65,8 @@
BUILD64 = 1
-# Some Fortran-specific tests fail which is probably not that important
-#SKIPTEST ?= 1
+# For SOS12 the following tests fail: 137 138 143 153 154 156 157 169
+SKIPTEST ?= 1
MERGE_SCRIPTS_isa-default-garcompiler-SOS12 = copy-all
MERGE_SCRIPTS_isa-default64-garcompiler-SOS12 = copy-relocated-only
@@ -83,8 +77,8 @@
include gar/category.mk
-post-install-modulated: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool)
-post-install-modulated: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER)))
+post-install: $(if $(PATCHFILES_POSTINSTALL_$(MODULATION)),patch-libtool)
+post-install: $(if $(COMPILER_TAGNAME_$(GARCOMPILER)),install-libtool-$(COMPILER_TAGNAME_$(GARCOMPILER)))
ginstall -d $(DESTDIR)$(docdir)/libtool
ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/libtool/README.CSW
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/libtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/libtool/trunk/checksums 2015-02-04 16:29:01 UTC (rev 24617)
+++ csw/mgar/pkg/libtool/trunk/checksums 2015-02-05 15:30:27 UTC (rev 24618)
@@ -1 +1 @@
-2ec8997e0c07249eb4cbd072417d70fe libtool-2.4.2.tar.xz
+ee9c087775aeb98ce53a9c69da865a55 libtool-2.4.5.tar.xz
Modified: csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch
===================================================================
--- csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch 2015-02-04 16:29:01 UTC (rev 24617)
+++ csw/mgar/pkg/libtool/trunk/files/0001-Preserve-norunpath.patch 2015-02-05 15:30:27 UTC (rev 24618)
@@ -1,17 +1,17 @@
-From 61f2e8e198520e36e898b2c52e06abfa1f2e0f3b Mon Sep 17 00:00:00 2001
+From 525582d45e936cdbbcf6dc4b6e0413661771d264 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 24 Nov 2010 10:45:07 +0100
+Date: Tue, 20 Jan 2015 11:51:20 +0100
Subject: [PATCH] Preserve -norunpath
---
- libltdl/config/ltmain.m4sh | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+ build-aux/ltmain.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
-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 ()
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 46a0bb5..f02e9fe 100644
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5343,6 +5343,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
@@ -19,15 +19,15 @@
# +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
+@@ -5356,7 +5357,7 @@ func_mode_link ()
+ # -stdlib=* select c++ std lib with clang
-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)
+- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-norunpath|-xnorunpath)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
--
-1.7.1
+2.2.1
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 2015-02-04 16:29:01 UTC (rev 24617)
+++ csw/mgar/pkg/libtool/trunk/files/0002-Forward-port-GCC-tags-patch.patch 2015-02-05 15:30:27 UTC (rev 24618)
@@ -1,15 +1,15 @@
---- libtool 2013-11-18 14:15:21.212825370 +0100
-+++ libtool.new 2013-11-18 14:18:36.734017047 +0100
-@@ -576,6 +576,8 @@
+--- libtool 2015-01-21 10:15:39.000000000 +0100
++++ libtool.new 2015-02-05 16:06:43.026764861 +0100
+@@ -915,6 +915,8 @@
# positional parameter $0, within a function call, is the name of the
# function.
- progpath="$0"
+ progpath=$0
+confpath="$0"
+tagspath="$0"
-
-
-@@ -1342,11 +1344,11 @@
+ # The name of this program.
+ progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+@@ -2641,11 +2643,11 @@
re_endcf='^# ### END LIBTOOL'
# Default configuration.
@@ -23,45 +23,45 @@
done
exit $?
-@@ -1396,14 +1398,14 @@
- case $tagname in
- CC) ;;
+@@ -2699,14 +2701,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"
+- 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,12 @@
-
- # save first non-option argument
- if test "$#" -gt 0; then
-+ case `which "$opt"` in
-+ /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
-+ ;;
-+ esac
- nonopt="$opt"
- shift
- fi
-@@ -1828,9 +1836,9 @@
+ # 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"
+@@ -2910,6 +2912,12 @@
+ {
+ # save first non-option argument
+ if test 0 -lt $#; then
++ case `which "$opt"` in
++ /opt/csw/gcc4/bin/*|/opt/csw/bin/gcc|/opt/csw/bin/g++|/opt/csw/bin/gcc-4.*|/opt/csw/bin/g++-4.*)
++ . /opt/csw/share/libtool/gcc4.conf
++ tagspath=/opt/csw/share/libtool/gcc4.tags
++ ;;
++ esac
+ nonopt=$1
+ shift
+ fi
+@@ -3170,9 +3178,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`"
+- 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