Re: CVS commit: pkgsrc/devel

To: joerg%netbsd.org@localhost, pkgsrc-changes%NetBSD.org@localhost
Subject: Re: CVS commit: pkgsrc/devel
From: Richard PALO <richard%netbsd.org@localhost>
Date: Wed, 03 Dec 2014 05:56:17 +0100
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Le 02/12/14 11:56, Joerg Sonnenberger a écrit :
> Module Name:  pkgsrc
> Committed By: joerg
> Date:         Tue Dec  2 10:56:24 UTC 2014
> 
> Modified Files:
>       pkgsrc/devel/libtool: distinfo
>       pkgsrc/devel/libtool-base: Makefile
>       pkgsrc/devel/libtool/patches: patch-ac
> Added Files:
>       pkgsrc/devel/libtool/patches: manual-ltmain.m4sh
> 
> Log Message:
> When relinking with DESTDIR, also look into DESTDIR for the desired
> object. Bump revision.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/libtool/distinfo
> cvs rdiff -u -r1.111 -r1.112 pkgsrc/devel/libtool-base/Makefile
> cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libtool/patches/manual-ltmain.m4sh
> cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/libtool/patches/patch-ac
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> 

In absence of update to libtool-2.4.4 (or 2.4.3), please update (ad nauseum) libtool with requested patches (or equivalent solution) that:
1. avoids duplicate symbols with shared SunOS c++ libraries (manual-libtool and patch-ab)
2. incorporates upstream patches (patch-ac)

cordially,

======================>8

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 3bcdb1d..8bd26d7 100644
- --- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -4,6 +4,6 @@ SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
- -SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda
- -SHA1 (patch-ac) = e29517d339483ee39eff7e6bac3013ad32ef2b00
+SHA1 (patch-ab) = 4bf7e3391791a1dda353d4abf3290e4c87be1f9a
+SHA1 (patch-ac) = 310b217a7bda5dcdf2b7618f6aefa59b5f3ad067
 SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index c2b72d8..3a67526 100644
- --- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -447,9 +447,9 @@ $NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
 -              # linking a shared library.
 -              output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -            fi
- -+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
 +            _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- -+            $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++              $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +
 +            # Commands to make compiler produce verbose output that lists
 +            # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 0285560..6c4959a 100644
- --- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -451,9 +451,9 @@ $NetBSD: patch-ab,v 1.84 2014/09/10 10:44:58 richard Exp $
 -              # linking a shared library.
 -              output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 -            fi
- -+          archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++            archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
 +            archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- -+            $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++              $CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +
 +            # Commands to make compiler produce verbose output that lists
 +            # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 0e6ac81..afe5f4a 100644
- --- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,6 +1,13 @@
 $NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $
 
- ---- libltdl/config/ltmain.sh.orig    Mon Oct 17 10:19:11 2011
+add back upstream patches:
+* Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=1645
+  see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+* build-aux/ltmain.in (func_mode_link): Pass -fstack-protector*
+  to the linker as it is required at link time to resolve libssp symbols.
+  From Yaakov Selkowitz
+
+--- libltdl/config/ltmain.sh.orig      2011-10-17 10:19:35.000000000 +0000
 +++ libltdl/config/ltmain.sh
 @@ -133,8 +133,9 @@ $lt_unset CDPATH
  # function.
@@ -14,6 +21,24 @@ $NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $
  : ${CP="cp -f"}
  test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
  : ${MAKE="make"}
+@@ -1180,7 +1181,7 @@ func_enable_tag "$optarg"
+   test "$opt_debug" = : || func_append preserve_args " --debug"
+ 
+   case $host in
+-    *cygwin* | *mingw* | *pw32* | *cegcc*)
++    *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
+       # don't eliminate duplications in $postdeps and $predeps
+       opt_duplicate_compiler_generated_deps=:
+       ;;
+@@ -5853,7 +5854,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|-fstack-protector*)
+         func_quote_for_eval "$arg"
+       arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
 @@ -6899,7 +6900,11 @@ func_mode_link ()
            # Finalize command for both is simple: just hardcode it.
            if test "$hardcode_direct" = yes &&
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJUfpftAAoJECAB22fHtp27jRMH/A6Riqdof/hU8IBA/LKqBW7o
ktlI4oDZjLWpVB0iH8o6PYbYiU0oOEexxUK2wzzEJBZUIT0Yi3Z39cOg86R22aDr
aWqba8xiXsKmwuVC6dAUsvEZA229wUGz7IFI2EM4x+FO6Te+ENYDYycw11+5423F
MDRY7jlY2Qz5c9rvXsJm9xGivKqDeeJ28QnK9BeZIyi8I+Y3q5gvOBWP2+enmxMU
gpRoXixnK+Xi5vCpms0YAZkjSrnCeDU9HXkY5eptL5pEj31XKGW5Lc4Y6OIGnNl1
EKz3OH0lXHNYQnKPYq64vl10tU0zng+O26v/mbGMWSGjvmIZ5500XAZT82LFQ6Q=
=TvS7
-----END PGP SIGNATURE-----
References:
- CVS commit: pkgsrc/devel
  - From: Joerg Sonnenberger
Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/p5-Dancer2
Previous by Thread: CVS commit: pkgsrc/devel
Next by Thread: CVS commit: pkgsrc/doc
Indexes:
Home | Main Index | Thread Index | Old Index