pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Make -export-symbols work properly under Interix. (Th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b383a3049461
branches:  trunk
changeset: 481734:b383a3049461
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Oct 11 16:51:56 2004 +0000

description:
Make -export-symbols work properly under Interix.  (The Interix ld(1) does
not implicitly add `_' to -retain-symbols-file values, so we have to add
it manually before doing the physical link.)

diffstat:

 devel/libtool-base/Makefile             |   4 +-
 devel/libtool/distinfo                  |   6 +-
 devel/libtool/patches/manual-libtool.m4 |   7 +-
 devel/libtool/patches/patch-ab          |  83 +++++++++++++++++---------------
 devel/libtool/patches/patch-ad          |  83 +++++++++++++++++---------------
 mk/platform/Interix.mk                  |   3 +-
 6 files changed, 97 insertions(+), 89 deletions(-)

diffs (truncated from 835 to 300 lines):

diff -r 0434405c3b38 -r b383a3049461 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Mon Oct 11 16:51:54 2004 +0000
+++ b/devel/libtool-base/Makefile       Mon Oct 11 16:51:56 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2004/10/08 17:37:51 tv Exp $
+# $NetBSD: Makefile,v 1.42 2004/10/11 16:51:56 tv Exp $
 #
 
 PKGNAME=       ${DISTNAME:C/-/-base-/}
-PKGREVISION=   2
+PKGREVISION=   3
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r 0434405c3b38 -r b383a3049461 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Mon Oct 11 16:51:54 2004 +0000
+++ b/devel/libtool/distinfo    Mon Oct 11 16:51:56 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.47 2004/10/08 17:37:50 tv Exp $
+$NetBSD: distinfo,v 1.48 2004/10/11 16:51:56 tv Exp $
 
 SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
 Size (libtool-1.5.10.tar.gz) = 2699923 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 18e8a4ebf8bc165d3eb94a3e9856a672239dab7c
+SHA1 (patch-ab) = c5fc6ca028a85582225c3dda4708ee6fc4c06356
 SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
-SHA1 (patch-ad) = e9ad9e7c5cfb3b7c9a966a1909f2ffba5e8b493e
+SHA1 (patch-ad) = e4d86c4ff3040611bc365ad9f94fa18a86d0bcf4
diff -r 0434405c3b38 -r b383a3049461 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Mon Oct 11 16:51:54 2004 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Mon Oct 11 16:51:56 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.7 2004/10/08 17:37:50 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.8 2004/10/11 16:51:56 tv Exp $
 
 --- libtool.m4.orig    2004-09-19 08:15:08.000000000 -0400
 +++ libtool.m4
@@ -266,13 +266,13 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM 
%4096/2*262144+1342177280)) -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5592,6 +5635,20 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5592,6 +5635,21 @@ $echo "local: *; };" >> $output_objdir/$
        fi
        ;;
  
@@ -284,6 +284,7 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
diff -r 0434405c3b38 -r b383a3049461 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Mon Oct 11 16:51:54 2004 +0000
+++ b/devel/libtool/patches/patch-ab    Mon Oct 11 16:51:56 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.42 2004/10/08 17:37:50 tv Exp $
+$NetBSD: patch-ab,v 1.43 2004/10/11 16:51:56 tv Exp $
 
 --- configure.orig     2004-09-19 08:22:04.000000000 -0400
 +++ configure
@@ -87,13 +87,13 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o 
$lib'
++      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7832,6 +7847,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7832,6 +7847,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -105,6 +105,7 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
 +      hardcode_libdir_flag_spec='${wl}-h,$libdir'
@@ -114,7 +115,7 @@
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
-@@ -8223,6 +8252,7 @@ beos*)
+@@ -8223,6 +8253,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -122,7 +123,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8337,16 +8367,17 @@ kfreebsd*-gnu)
+@@ -8337,16 +8368,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -146,7 +147,7 @@
        need_version=yes
        ;;
    esac
-@@ -8422,15 +8453,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8422,15 +8454,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -175,7 +176,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8507,11 +8545,11 @@ knetbsd*-gnu)
+@@ -8507,11 +8546,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -189,7 +190,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8542,10 +8580,10 @@ nto-qnx*)
+@@ -8542,10 +8581,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -202,7 +203,7 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -10105,9 +10143,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10105,9 +10144,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -213,7 +214,7 @@
          ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10817,6 +10853,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10817,6 +10854,8 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
      esac
      ;;
@@ -222,7 +223,7 @@
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10936,6 +10974,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10936,6 +10975,13 @@ if test -z "$aix_libpath"; then aix_libp
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -236,7 +237,7 @@
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11324,6 +11369,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11370,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -251,7 +252,7 @@
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11371,9 +11424,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11425,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -264,7 +265,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11395,6 +11450,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11451,10 @@ echo $ECHO_N "checking for $compiler opt
        ;;
        esac
        ;;
@@ -275,7 +276,7 @@
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11469,6 +11528,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11469,6 +11529,8 @@ echo $ECHO_N "checking for $compiler opt
            ;;
        esac
        ;;
@@ -284,7 +285,7 @@
        irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
-@@ -11939,6 +12000,7 @@ beos*)
+@@ -11939,6 +12001,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -292,7 +293,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -12053,16 +12115,17 @@ kfreebsd*-gnu)
+@@ -12053,16 +12116,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -316,7 +317,7 @@
        need_version=yes
        ;;
    esac
-@@ -12138,15 +12201,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12138,15 +12202,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -345,7 +346,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12223,11 +12293,11 @@ knetbsd*-gnu)
+@@ -12223,11 +12294,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -359,7 +360,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12258,10 +12328,10 @@ nto-qnx*)
+@@ -12258,10 +12329,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -372,7 +373,7 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -13805,9 +13875,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13876,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -385,7 +386,7 @@
        ;;
  
      msdosdjgpp*)
-@@ -13836,6 +13908,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13909,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -397,7 +398,7 @@
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14221,6 +14298,17 @@ EOF
+@@ -14221,6 +14299,17 @@ EOF
        fi
        ;;
  
@@ -409,13 +410,13 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) 
-o $lib'
++      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
 +
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14708,6 +14796,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14708,6 +14797,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -427,6 +428,7 @@
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file 
$wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
@@ -436,7 +438,7 @@



Home | Main Index | Thread Index | Old Index