summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorgrant <grant>2004-12-18 17:42:24 +0000
committergrant <grant>2004-12-18 17:42:24 +0000
commitd6ead7a9fe5ae97cf4715a4a76b9edfdaa98f31f (patch)
treef4cb4fb315d486715eb26b3b1826e509e722ac45 /devel
parentf54bae4cf352b231e3b55e9d66f4542ed5071259 (diff)
downloadpkgsrc-d6ead7a9fe5ae97cf4715a4a76b9edfdaa98f31f.tar.gz
in the command run when -export-symbols is used on Darwin with xlc,
ensure there is no whitespace on the command line when passing -install_name to the linker, as this breaks the build. this fixes the build of audio/libaudiofile and other packages using -export-symbols on Darwin with xlc. bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/libtool-base/Makefile4
-rw-r--r--devel/libtool/distinfo4
-rw-r--r--devel/libtool/patches/patch-ab40
3 files changed, 42 insertions, 6 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index f696657690f..5b6358aece1 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2004/12/17 16:24:23 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2004/12/18 17:42:24 grant Exp $
#
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 7
+PKGREVISION= 8
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 36411e32465..4f06811648a 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.52 2004/12/17 16:24:22 jlam Exp $
+$NetBSD: distinfo,v 1.53 2004/12/18 17:42:24 grant 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) = 11c564b44d22a9a49219ef1edd76aa469fc4a3f2
+SHA1 (patch-ab) = fa1f9d9b879e1c7b44c7c8a9b0b0969750b6de77
SHA1 (patch-ac) = 2123be2150e7f86980b903574b742454addd7b75
SHA1 (patch-ad) = 17ae54beead8ed189cf7aab8708d40d499750e7d
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 2ee6f992e6c..34a029a0fdf 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.46 2004/11/11 22:29:03 tv Exp $
+$NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
---- configure.orig 2004-09-19 08:22:04.000000000 -0400
+--- configure.orig 2004-09-19 22:22:04.000000000 +1000
+++ configure
@@ -322,11 +322,11 @@ else
@@ -93,6 +93,15 @@ $NetBSD: patch-ab,v 1.46 2004/11/11 22:29:03 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -7717,7 +7732,7 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -7832,6 +7847,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -214,6 +223,15 @@ $NetBSD: patch-ab,v 1.46 2004/11/11 22:29:03 tv Exp $
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -10659,7 +10696,7 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -10817,6 +10854,16 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
@@ -449,6 +467,15 @@ $NetBSD: patch-ab,v 1.46 2004/11/11 22:29:03 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -14593,7 +14705,7 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -14708,6 +14820,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -602,6 +629,15 @@ $NetBSD: patch-ab,v 1.46 2004/11/11 22:29:03 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+@@ -16955,7 +17109,7 @@ if test -z "$aix_libpath"; then aix_libp
+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -17070,6 +17224,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;