pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libtool fix up Darwin patches
details: https://anonhg.NetBSD.org/pkgsrc/rev/fb9c8ee6b459
branches: trunk
changeset: 473683:fb9c8ee6b459
user: danw <danw%pkgsrc.org@localhost>
date: Fri Apr 23 01:17:25 2004 +0000
description:
fix up Darwin patches
diffstat:
devel/libtool/distinfo | 4 +-
devel/libtool/patches/manual-libtool.m4 | 23 +++++-
devel/libtool/patches/patch-ab | 113 +++++++++++++++++++++----------
3 files changed, 96 insertions(+), 44 deletions(-)
diffs (truncated from 432 to 300 lines):
diff -r 18500b59b67a -r fb9c8ee6b459 devel/libtool/distinfo
--- a/devel/libtool/distinfo Thu Apr 22 23:52:19 2004 +0000
+++ b/devel/libtool/distinfo Fri Apr 23 01:17:25 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2004/04/22 14:40:29 tv Exp $
+$NetBSD: distinfo,v 1.43 2004/04/23 01:17:25 danw Exp $
SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
Size (libtool-1.5.6.tar.gz) = 2665434 bytes
SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 8fd750bc0d6a5cd247f7788909325abd073efabf
+SHA1 (patch-ab) = 34ff3f7969300437483c059d1aba590b762df0e1
SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1
SHA1 (patch-ad) = 83172e62964fd3e666b4e47101970ec27769dc5c
diff -r 18500b59b67a -r fb9c8ee6b459 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Thu Apr 22 23:52:19 2004 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Fri Apr 23 01:17:25 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: manual-libtool.m4,v 1.3 2004/04/21 19:24:49 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
---- libtool.m4.orig Fri Jan 23 01:07:04 2004
+--- libtool.m4.orig Thu Apr 1 22:46:14 2004
+++ libtool.m4
@@ -1183,8 +1183,9 @@ beos*)
;;
@@ -182,7 +182,20 @@
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
-@@ -4839,6 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4808,9 +4848,11 @@ AC_MSG_CHECKING([for $compiler option to
+ ;;
+
+ darwin* | rhapsody*)
+- # PIC is the default on this platform
++ # PIC is the default on this platform, and static linking of
++ # binaries generally doesn't work
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
+ ;;
+
+ msdosdjgpp*)
+@@ -4839,6 +4881,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -194,7 +207,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5131,6 +5176,17 @@ EOF
+@@ -5131,6 +5178,17 @@ EOF
fi
;;
@@ -212,7 +225,7 @@
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 +5590,20 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5534,6 +5592,20 @@ $echo "local: *; };" >> $output_objdir/$
;;
esac
fi
diff -r 18500b59b67a -r fb9c8ee6b459 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab Thu Apr 22 23:52:19 2004 +0000
+++ b/devel/libtool/patches/patch-ab Fri Apr 23 01:17:25 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.37 2004/04/22 14:40:29 tv Exp $
+$NetBSD: patch-ab,v 1.38 2004/04/23 01:17:25 danw Exp $
---- configure.orig Thu Apr 22 10:23:09 2004
+--- configure.orig Sun Apr 11 01:35:42 2004
+++ configure
@@ -4440,10 +4440,13 @@ beos*)
lt_cv_deplibs_check_method=pass_all
@@ -31,7 +31,20 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -6888,6 +6895,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6857,9 +6864,11 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+
+ darwin* | rhapsody*)
+- # PIC is the default on this platform
++ # PIC is the default on this platform, and static linking of
++ # binaries generally doesn't work
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
++ lt_prog_compiler_static=''
+ ;;
+
+ msdosdjgpp*)
+@@ -6888,6 +6897,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -43,7 +56,7 @@
*)
lt_prog_compiler_pic='-fPIC'
;;
-@@ -7263,6 +7275,17 @@ EOF
+@@ -7263,6 +7277,17 @@ EOF
fi
;;
@@ -61,7 +74,7 @@
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7770,6 +7793,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7770,6 +7795,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -82,7 +95,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'
-@@ -8158,8 +8195,9 @@ beos*)
+@@ -8158,8 +8197,9 @@ beos*)
;;
bsdi4*)
@@ -93,7 +106,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'
-@@ -8275,15 +8313,15 @@ kfreebsd*-gnu)
+@@ -8275,15 +8315,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -115,7 +128,7 @@
need_version=yes
;;
esac
-@@ -8359,15 +8397,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8359,15 +8399,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -144,7 +157,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -8403,7 +8448,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8403,7 +8450,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -153,7 +166,7 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8527,7 +8572,7 @@ sco3.2v5*)
+@@ -8527,7 +8574,7 @@ sco3.2v5*)
;;
solaris*)
@@ -162,7 +175,7 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10777,6 +10822,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10777,6 +10824,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -171,7 +184,7 @@
irix5* | irix6*)
case $cc_basename in
CC)
-@@ -10885,6 +10932,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10885,6 +10934,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=
@@ -185,7 +198,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
-@@ -11257,6 +11311,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11257,6 +11313,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@@ -200,7 +213,7 @@
# Clean up.
rm -f a.out a.exe
else
-@@ -11304,9 +11366,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11304,9 +11368,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -213,7 +226,7 @@
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -11328,6 +11392,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11328,6 +11394,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -224,7 +237,7 @@
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
-@@ -11392,6 +11460,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11392,6 +11462,8 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -233,7 +246,7 @@
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
-@@ -11860,8 +11930,9 @@ beos*)
+@@ -11860,8 +11932,9 @@ beos*)
;;
bsdi4*)
@@ -244,7 +257,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'
-@@ -11977,15 +12048,15 @@ kfreebsd*-gnu)
+@@ -11977,15 +12050,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -266,7 +279,7 @@
need_version=yes
;;
esac
-@@ -12061,15 +12132,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12061,15 +12134,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -295,7 +308,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -12105,7 +12183,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12105,7 +12185,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -304,7 +317,7 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12229,7 +12307,7 @@ sco3.2v5*)
+@@ -12229,7 +12309,7 @@ sco3.2v5*)
;;
solaris*)
@@ -313,7 +326,20 @@
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13759,6 +13837,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13728,9 +13808,11 @@ echo $ECHO_N "checking for $compiler opt
+ ;;
+
+ darwin* | rhapsody*)
+- # PIC is the default on this platform
++ # PIC is the default on this platform, and static linking of
++ # binaries generally doesn't work
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic_F77='-fno-common'
++ lt_prog_compiler_static_F77=''
+ ;;
+
+ msdosdjgpp*)
+@@ -13759,6 +13841,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -325,7 +351,7 @@
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
-@@ -14134,6 +14217,17 @@ EOF
+@@ -14134,6 +14221,17 @@ EOF
fi
;;
@@ -343,7 +369,7 @@
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14621,6 +14715,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14621,6 +14719,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
Home |
Main Index |
Thread Index |
Old Index