[pkgsrc/trunk]: pkgsrc/devel/libtool Permit libtool to generate -fstack-prote...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ef819fa4683
branches:  trunk
changeset: 634169:9ef819fa4683
user:      richard <richard%pkgsrc.org@localhost>
date:      Sat May 10 13:29:41 2014 +0000

description:
Permit libtool to generate -fstack-protector* on all platforms in --mode=link
while suppressing -nostdlib (for the moment on SunOS g++ platforms only)
allowing it to actually work with g++... gcc was never affected by -nostdlib.

diffstat:

 devel/libtool/distinfo                  |     8 +-
 devel/libtool/patches/manual-libtool.m4 |    20 +-
 devel/libtool/patches/patch-ab          |  1871 ++++++++++++++++++++++++++++--
 devel/libtool/patches/patch-ac          |    35 +-
 devel/libtool/patches/patch-ad          |  1271 ++++++++++++++++++++-
 5 files changed, 3035 insertions(+), 170 deletions(-)

diffs (truncated from 4118 to 300 lines):

diff -r 12ec75eed535 -r 9ef819fa4683 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Sat May 10 11:44:29 2014 +0000
+++ b/devel/libtool/distinfo    Sat May 10 13:29:41 2014 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.90 2014/03/08 19:57:25 joerg Exp $
+$NetBSD: distinfo,v 1.91 2014/05/10 13:29:41 richard Exp $
 
 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) = cf6e8852b6c9eb04256904085f4ee6fefc470a02
-SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
-SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
+SHA1 (patch-ab) = 40452951d28dd52f70c66185568a132ae5852f2f
+SHA1 (patch-ac) = 9e0e79308e78ceabfa5766fb1562c723796be85d
+SHA1 (patch-ad) = bfb7ea5e36a0dd770ce7fdc18422269b25f90d02
diff -r 12ec75eed535 -r 9ef819fa4683 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Sat May 10 11:44:29 2014 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Sat May 10 13:29:41 2014 +0000
@@ -1,9 +1,7 @@
-$NetBSD: manual-libtool.m4,v 1.38 2014/03/08 19:57:25 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.39 2014/05/10 13:29:41 richard Exp $
 
 --- libltdl/m4/libtool.m4.orig 2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
---- libtool.m4.orig    2011-10-17 10:17:05.000000000 +0000
-+++ libtool.m4
 @@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
    esac
@@ -378,7 +376,7 @@
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes;
          _LT_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -401,7 +399,7 @@
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes;
        ;;
  
        netbsd*)
@@ -424,27 +422,27 @@
        ;;
  
        *nto* | *qnx*)
-@@ -6740,9 +6851,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6740,9 +6851,9 @@ if test "$_lt_caught_CXX_error" != yes;
            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
              _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
 -              _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+              _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++              _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_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 -                $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+                $CC -shared $pic_flag -nostdlib ${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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
-@@ -6751,9 +6862,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6751,9 +6862,9 @@ if test "$_lt_caught_CXX_error" != yes;
              else
                # g++ 2.7 appears to require `-G' NOT `-shared' on this
                # platform.
 -              _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+              _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++              _LT_TAGVAR(archive_cmds, $1)='$CC -G $predep_objects $libobjs $deplibs $postdep_objects $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 -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+                $CC -G -nostdlib ${wl}-M $wl$lib.exp $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++                $CC -G ${wl}-M $wl$lib.exp ${wl}-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $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 -r 12ec75eed535 -r 9ef819fa4683 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Sat May 10 11:44:29 2014 +0000
+++ b/devel/libtool/patches/patch-ab    Sat May 10 13:29:41 2014 +0000
@@ -1,8 +1,987 @@
-$NetBSD: patch-ab,v 1.78 2014/03/08 19:57:25 joerg Exp $
+$NetBSD: patch-ab,v 1.79 2014/05/10 13:29:41 richard Exp $
 
---- configure.orig     2014-03-06 15:38:07.000000000 +0000
+--- configure.orig     2014-05-04 20:22:44.682564874 +0000
 +++ configure
-@@ -5335,7 +5335,7 @@ else
+@@ -1,13 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for GNU Libtool 2.4.2.
++# Generated by GNU Autoconf 2.69 for GNU Libtool 2.4.2.
+ #
+ # Report bugs to <bug-libtool%gnu.org@localhost>.
+ #
+ #
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -136,6 +134,31 @@ export LANGUAGE
+ # CDPATH.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
++# Use a proper internal environment variable to ensure we don't fall
++  # into an infinite loop, continuously re-executing ourselves.
++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
++    _as_can_reexec=no; export _as_can_reexec;
++    # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++as_fn_exit 255
++  fi
++  # We don't want this to propagate to other subprocesses.
++          { _as_can_reexec=; unset _as_can_reexec;}
+ if test "x$CONFIG_SHELL" = x; then
+   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
+ else
+   exitcode=1; echo positional parameters were not saved.
+ fi
+-test x\$exitcode = x0 || exit 1"
++test x\$exitcode = x0 || exit 1
++test -x / || exit 1"
+   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+@@ -222,21 +246,25 @@ IFS=$as_save_IFS
+ 
+ 
+       if test "x$CONFIG_SHELL" != x; then :
+-  # We cannot yet assume a decent shell, so we have to provide a
+-      # neutralization value for shells without unset; and this also
+-      # works around shells that cannot unset nonexistent variables.
+-      # Preserve -v and -x to the replacement shell.
+-      BASH_ENV=/dev/null
+-      ENV=/dev/null
+-      (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+-      export CONFIG_SHELL
+-      case $- in # ((((
+-        *v*x* | *x*v* ) as_opts=-vx ;;
+-        *v* ) as_opts=-v ;;
+-        *x* ) as_opts=-x ;;
+-        * ) as_opts= ;;
+-      esac
+-      exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++  export CONFIG_SHELL
++             # We cannot yet assume a decent shell, so we have to provide a
++# neutralization value for shells without unset; and this also
++# works around shells that cannot unset nonexistent variables.
++# Preserve -v and -x to the replacement shell.
++BASH_ENV=/dev/null
++ENV=/dev/null
++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++case $- in # ((((
++  *v*x* | *x*v* ) as_opts=-vx ;;
++  *v* ) as_opts=-v ;;
++  *x* ) as_opts=-x ;;
++  * ) as_opts= ;;
++esac
++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
++# Admittedly, this is quite paranoid, since all the known shells bail
++# out after a failed `exec'.
++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
++exit 255
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -339,6 +367,14 @@ $as_echo X"$as_dir" |
+ 
+ 
+ } # as_fn_mkdir_p
++
++# as_fn_executable_p FILE
++# -----------------------
++# Test if FILE is an executable regular file.
++as_fn_executable_p ()
++{
++  test -f "$1" && test -x "$1"
++} # as_fn_executable_p
+ # as_fn_append VAR VALUE
+ # ----------------------
+ # Append the text in VALUE to the end of the definition contained in VAR. Take
+@@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
+   chmod +x "$as_me.lineno" ||
+     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
++  # already done that, so ensure we don't try to do so again and fall
++  # in an infinite loop.  This has already happened in practice.
++  _as_can_reexec=no; export _as_can_reexec
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensitive to this).
+@@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
+     # ... but there are two gotchas:
+     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
++    # In both cases, we have to default to `cp -pR'.
+     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
++      as_ln_s='cp -pR'
+   elif ln conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s=ln
+   else
+-    as_ln_s='cp -p'
++    as_ln_s='cp -pR'
+   fi
+ else
+-  as_ln_s='cp -p'
++  as_ln_s='cp -pR'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+@@ -515,28 +555,8 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-      test -d "$1/.";
+-      else
+-      case $1 in #(
+-      -*)set "./$1";;
+-      esac;
+-      case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+-      ???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
++as_test_x='test -x'
++as_executable_p=as_fn_executable_p
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -692,6 +712,7 @@ CPP
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
++am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+@@ -719,6 +740,10 @@ build_os
+ build_vendor
+ build_cpu
+ build
++AM_BACKSLASH
++AM_DEFAULT_VERBOSITY
++AM_DEFAULT_V
++AM_V
+ am__untar
+ am__tar
+ AMTAR
+@@ -788,6 +813,7 @@ SHELL'
+ ac_subst_files=''
+ ac_user_opts='
+ enable_option_checking
++enable_silent_rules
+ enable_ltdl_install
+ enable_dependency_tracking
+ enable_shared
+@@ -1270,8 +1296,6 @@ target=$target_alias
+ if test "x$host_alias" != x; then