pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libtool Update Interix support once more (delibe...
details: https://anonhg.NetBSD.org/pkgsrc/rev/037bb6fe234d
branches: trunk
changeset: 473610:037bb6fe234d
user: tv <tv%pkgsrc.org@localhost>
date: Wed Apr 21 19:24:49 2004 +0000
description:
Update Interix support once more (deliberately no PKGREVISION bump);
add a random image base address for shlibs that's more likely to be "out
of the way" from the rest of the OS and application.
diffstat:
devel/libtool/distinfo | 6 +-
devel/libtool/patches/manual-libtool.m4 | 28 ++-
devel/libtool/patches/patch-ab | 202 +++++++++++++++----------
devel/libtool/patches/patch-ad | 248 ++++++++++++++++++-------------
4 files changed, 284 insertions(+), 200 deletions(-)
diffs (truncated from 1673 to 300 lines):
diff -r 48425d5cf646 -r 037bb6fe234d devel/libtool/distinfo
--- a/devel/libtool/distinfo Wed Apr 21 18:45:09 2004 +0000
+++ b/devel/libtool/distinfo Wed Apr 21 19:24:49 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2004/04/21 14:55:32 tv Exp $
+$NetBSD: distinfo,v 1.41 2004/04/21 19:24:49 tv Exp $
SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
Size (libtool-1.5.2.tar.gz) = 2653072 bytes
SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = ef15cd8d1436719d2c4715ceb139474ce3e81a30
+SHA1 (patch-ab) = 9579b82ec97663665f1cfc6e61f965f95b0e0b95
SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715
-SHA1 (patch-ad) = 2fdd8d3bd276bdadf25811b5b102c823adeced34
+SHA1 (patch-ad) = 97be231b803d8a058dfa11930f3314126837ed35
diff -r 48425d5cf646 -r 037bb6fe234d devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Wed Apr 21 18:45:09 2004 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Wed Apr 21 19:24:49 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.2 2004/04/21 14:55:32 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.3 2004/04/21 19:24:49 tv Exp $
--- libtool.m4.orig Fri Jan 23 01:07:04 2004
+++ libtool.m4
@@ -194,30 +194,42 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5131,6 +5176,11 @@ EOF
+@@ -5131,6 +5176,17 @@ EOF
fi
;;
+ interix3*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -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 -o $lib'
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # 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'
+ ;;
+
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'
-@@ -5534,6 +5584,14 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5534,6 +5590,20 @@ $echo "local: *; };" >> $output_objdir/$
;;
esac
fi
+ ;;
+
+ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # 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(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'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
irix5* | irix6* | nonstopux*)
diff -r 48425d5cf646 -r 037bb6fe234d devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab Wed Apr 21 18:45:09 2004 +0000
+++ b/devel/libtool/patches/patch-ab Wed Apr 21 19:24:49 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
+$NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
--- configure.orig Sun Jan 25 07:36:38 2004
+++ configure
@@ -252,19 +252,25 @@
*)
lt_prog_compiler_pic='-fPIC'
;;
-@@ -7243,6 +7275,11 @@ EOF
+@@ -7243,6 +7275,17 @@ EOF
fi
;;
+ interix3*)
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # 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'
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7457,7 +7494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7457,7 +7500,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -274,7 +280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7517,7 +7555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7517,7 +7561,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -284,22 +290,28 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7748,6 +7787,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7748,6 +7793,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
+ interix3*)
++ # Oy, what a hack.
++ # Because shlibs are not compiled -fPIC due to broken code, we must
++ # choose an --image-base. Otherwise, 0x10000000 will be chosen for
++ # all libraries, leading to runtime relocations -- slow and very
++ # 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'
++ export_dynamic_flag_spec='${wl}-E'
+ hardcode_direct=yes
++ hardcode_libdir_flag_spec='${wl}-h,$libdir'
+ hardcode_shlibpath_var=no
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-h,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
+ ;;
+
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'
-@@ -8136,8 +8183,9 @@ beos*)
+@@ -8136,8 +8195,9 @@ beos*)
;;
bsdi4*)
@@ -310,7 +322,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'
-@@ -8253,15 +8301,15 @@ kfreebsd*-gnu)
+@@ -8253,15 +8313,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -332,7 +344,7 @@
need_version=yes
;;
esac
-@@ -8337,15 +8385,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8337,15 +8397,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -361,7 +373,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -8381,7 +8436,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8381,7 +8448,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -370,7 +382,7 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8505,7 +8560,7 @@ sco3.2v5*)
+@@ -8505,7 +8572,7 @@ sco3.2v5*)
;;
solaris*)
@@ -379,7 +391,7 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8708,7 +8763,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8708,7 +8775,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -389,7 +401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8811,7 +8867,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8811,7 +8879,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -399,7 +411,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8876,7 +8933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8876,7 +8945,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -409,7 +421,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8969,7 +9027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -8969,7 +9039,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -419,7 +431,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9034,7 +9093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9034,7 +9105,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -429,7 +441,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9100,7 +9160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9100,7 +9172,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -439,7 +451,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9166,7 +9227,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -9166,7 +9239,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -449,7 +461,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10411,7 +10473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10411,7 +10485,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -459,7 +471,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10472,7 +10535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -10472,7 +10547,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -469,7 +481,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10746,6 +10810,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10746,6 +10822,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -478,7 +490,7 @@
irix5* | irix6*)
case $cc_basename in
CC)
-@@ -10854,6 +10920,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10854,6 +10932,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=
@@ -492,7 +504,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
-@@ -11226,6 +11299,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11226,6 +11311,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
Home |
Main Index |
Thread Index |
Old Index