diff options
author | tv <tv> | 2005-07-03 19:42:14 +0000 |
---|---|---|
committer | tv <tv> | 2005-07-03 19:42:14 +0000 |
commit | 7ae0a826d441bf0a1399ee2c3d9bb8c97739f9b2 (patch) | |
tree | 1728181aee3f7e1eee3785283aa0646a782767ab /devel/libtool | |
parent | cf372a855dc33c4303dcc1df67773e6cfdcedbdb (diff) | |
download | pkgsrc-7ae0a826d441bf0a1399ee2c3d9bb8c97739f9b2.tar.gz |
Another Interix fix; $soname -> $soname.exp in two places where it was not
fixed before.
Diffstat (limited to 'devel/libtool')
-rw-r--r-- | devel/libtool/distinfo | 6 | ||||
-rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 6 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 12 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ad | 12 |
4 files changed, 18 insertions, 18 deletions
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 02898e655ef..b086aabeb05 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.61 2005/07/03 19:01:50 tv Exp $ +$NetBSD: distinfo,v 1.62 2005/07/03 19:42:14 tv Exp $ SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b Size (libtool-1.5.18.tar.gz) = 2780846 bytes SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d -SHA1 (patch-ab) = 65dfc7282ea322b6c372ff7532ed3f81f8918a97 +SHA1 (patch-ab) = 60ab5ae3874fe13abfd089b0cf544f57517acc2b SHA1 (patch-ac) = e7a067d002f7948361e2e90862cb96c6bba1959d -SHA1 (patch-ad) = 23784e97c5cf4f6e7d90d3c4ee829379ae3ef408 +SHA1 (patch-ad) = 5cb326bd404762d15b053a99ea8cf041b087dc94 diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 50e765b33d3..fe843d20089 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,4 +1,4 @@ -$NetBSD: manual-libtool.m4,v 1.15 2005/07/03 19:01:50 tv Exp $ +$NetBSD: manual-libtool.m4,v 1.16 2005/07/03 19:42:14 tv Exp $ --- libtool.m4.orig 2005-05-15 09:41:23.000000000 -0400 +++ libtool.m4 @@ -183,7 +183,7 @@ $NetBSD: manual-libtool.m4,v 1.15 2005/07/03 19:01:50 tv Exp $ + # 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(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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + ;; irix5* | irix6*) case $cc_basename in @@ -339,7 +339,7 @@ $NetBSD: manual-libtool.m4,v 1.15 2005/07/03 19:01:50 tv Exp $ + # 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(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.exp ${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}-rpath,$libdir' diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index beae08809a6..e5bfeede789 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $ +$NetBSD: patch-ab,v 1.54 2005/07/03 19:42:14 tv Exp $ ---- configure.orig 2005-07-03 14:55:24.000000000 -0400 +--- configure.orig 2005-07-03 15:36:30.000000000 -0400 +++ configure @@ -322,11 +322,11 @@ else @@ -303,7 +303,7 @@ $NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $ + # 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' ++ 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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + export_dynamic_flag_spec='${wl}-E' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -526,7 +526,7 @@ $NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $ + # memory consuming. To do this, we pick a random 256KB-aligned + # start address between 0x50000000 and 0x6ffc0000 at link time. + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='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' ++ archive_expsym_cmds_CXX='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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + ;; irix5* | irix6*) case $cc_basename in @@ -863,7 +863,7 @@ $NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $ + # 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' ++ 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.exp ${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}-rpath,$libdir' @@ -1048,7 +1048,7 @@ $NetBSD: patch-ab,v 1.53 2005/07/03 19:01:50 tv Exp $ + # memory consuming. To do this, we pick a random 256KB-aligned + # start address between 0x50000000 and 0x6ffc0000 at link time. + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='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' ++ archive_expsym_cmds_GCJ='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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_direct_GCJ=yes + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index eefbeb506e9..9045e877960 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $ +$NetBSD: patch-ad,v 1.26 2005/07/03 19:42:14 tv Exp $ ---- libltdl/configure.orig 2005-07-03 14:55:24.000000000 -0400 +--- libltdl/configure.orig 2005-07-03 15:36:30.000000000 -0400 +++ libltdl/configure @@ -322,11 +322,11 @@ else @@ -323,7 +323,7 @@ $NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $ + # 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' ++ 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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + export_dynamic_flag_spec='${wl}-E' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -546,7 +546,7 @@ $NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $ + # memory consuming. To do this, we pick a random 256KB-aligned + # start address between 0x50000000 and 0x6ffc0000 at link time. + archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='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' ++ archive_expsym_cmds_CXX='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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + ;; irix5* | irix6*) case $cc_basename in @@ -883,7 +883,7 @@ $NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $ + # 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' ++ 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.exp ${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}-rpath,$libdir' @@ -1068,7 +1068,7 @@ $NetBSD: patch-ad,v 1.25 2005/07/03 19:01:51 tv Exp $ + # memory consuming. To do this, we pick a random 256KB-aligned + # start address between 0x50000000 and 0x6ffc0000 at link time. + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='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' ++ archive_expsym_cmds_GCJ='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.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + export_dynamic_flag_spec_GCJ='${wl}-E' + hardcode_direct_GCJ=yes + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' |