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.
This commit is contained in:
grant
parent
7a8df0eed8
commit
76c3898cdf
3 changed files with 42 additions and 6 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
;;
|
||||
|
|
|
|||
Loading…
Reference in a new issue