pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel libtool-base 1.5.18nb1: Update the patches per m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e60917650dc8
branches: trunk
changeset: 494014:e60917650dc8
user: tv <tv%pkgsrc.org@localhost>
date: Wed May 18 14:40:04 2005 +0000
description:
libtool-base 1.5.18nb1: Update the patches per manual.README.
While here, since those instructions are still not being heeded, make the
warning comment extremely loud and obnoxious, and put it in both
libtool/Makefile.common and libtool-base/Makefile.
diffstat:
devel/libtool-base/Makefile | 34 +-
devel/libtool/Makefile.common | 25 +-
devel/libtool/distinfo | 6 +-
devel/libtool/patches/manual-libtool.m4 | 58 +-
devel/libtool/patches/patch-ab | 589 ++++++++++++++-
devel/libtool/patches/patch-ad | 1184 +++++++++++++++++++++++++-----
6 files changed, 1588 insertions(+), 308 deletions(-)
diffs (truncated from 2691 to 300 lines):
diff -r a89b06e12142 -r e60917650dc8 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Wed May 18 14:23:10 2005 +0000
+++ b/devel/libtool-base/Makefile Wed May 18 14:40:04 2005 +0000
@@ -1,16 +1,32 @@
-# $NetBSD: Makefile,v 1.62 2005/05/18 11:57:01 adam Exp $
+# $NetBSD: Makefile,v 1.63 2005/05/18 14:40:04 tv Exp $
+
+###########################################################################
+###########################################################################
+#
+# HEADS UP! DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
+###########################################################################
+###########################################################################
+#
+# This package is maintained specially in order to preserve pkgsrc
+# specific OS changes that diverge from the "out of the box" libtool.
+# In order to keep this package in a maintainable condition, the .m4 files
+# must be manipulated in order to generate the patch-* files.
+#
+# See devel/libtool/patches/manual.README for instructions on how to make
+# these patch files properly; otherwise your changes WILL be lost on the
+# next libtool update.
+#
+# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
+# INSTRUCTIONS. There are no exceptions to this rule.
+#
+###########################################################################
+###########################################################################
.include "../../devel/libtool/Makefile.common"
-#
-# HEADS UP! Before changing PKGREVISION: Did you remember to merge
-# any changes into the m4 manual diffs? Updating patch-a[bd] is not enough!
-#
-# See devel/libtool/patches/manual.README for instructions on how to make
-# these patch files properly, so that your changes won't be lost completely
-# on the next libtool update.
-#
PKGNAME= ${DISTNAME:S/-/-base-/}
+PKGREVISION= 1
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff -r a89b06e12142 -r e60917650dc8 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Wed May 18 14:23:10 2005 +0000
+++ b/devel/libtool/Makefile.common Wed May 18 14:40:04 2005 +0000
@@ -1,4 +1,27 @@
-# $NetBSD: Makefile.common,v 1.62 2005/05/18 11:57:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.63 2005/05/18 14:40:04 tv Exp $
+
+###########################################################################
+###########################################################################
+#
+# HEADS UP! DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
+###########################################################################
+###########################################################################
+#
+# This package is maintained specially in order to preserve pkgsrc
+# specific OS changes that diverge from the "out of the box" libtool.
+# In order to keep this package in a maintainable condition, the .m4 files
+# must be manipulated in order to generate the patch-* files.
+#
+# See devel/libtool/patches/manual.README for instructions on how to make
+# these patch files properly; otherwise your changes WILL be lost on the
+# next libtool update.
+#
+# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
+# INSTRUCTIONS. There are no exceptions to this rule.
+#
+###########################################################################
+###########################################################################
DISTNAME= libtool-1.5.18
CATEGORIES= devel pkgtools
diff -r a89b06e12142 -r e60917650dc8 devel/libtool/distinfo
--- a/devel/libtool/distinfo Wed May 18 14:23:10 2005 +0000
+++ b/devel/libtool/distinfo Wed May 18 14:40:04 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.58 2005/05/18 11:57:12 adam Exp $
+$NetBSD: distinfo,v 1.59 2005/05/18 14:40:04 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) = f717ce4a2c72dc18aaaf05fb07d0c7db2706e752
+SHA1 (patch-ab) = 89c29eff6957e75a78f76b075194b752bb1997b5
SHA1 (patch-ac) = 381f835a8fe188d3b038de074a61502bc8f4a27a
-SHA1 (patch-ad) = 0c2c402fffe43056f8b632ba2e59da26772f3794
+SHA1 (patch-ad) = 46fdc723421a2b3198bcbaa95eafc89441465544
diff -r a89b06e12142 -r e60917650dc8 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Wed May 18 14:23:10 2005 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Wed May 18 14:40:04 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: manual-libtool.m4,v 1.13 2005/03/22 15:12:08 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.14 2005/05/18 14:40:04 tv Exp $
---- libtool.m4.orig 2005-02-12 07:18:34.000000000 -0500
+--- libtool.m4.orig 2005-05-15 09:41:23.000000000 -0400
+++ libtool.m4
-@@ -346,11 +346,11 @@ else
+@@ -388,11 +388,11 @@ else
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -16,7 +16,7 @@
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
-@@ -1198,6 +1198,7 @@ beos*)
+@@ -1250,6 +1250,7 @@ beos*)
bsdi[[45]]*)
version_type=linux
need_version=no
@@ -24,7 +24,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'
-@@ -1315,15 +1316,16 @@ freebsd* | dragonfly*)
+@@ -1367,15 +1368,16 @@ freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -47,7 +47,7 @@
need_version=yes
;;
esac
-@@ -1399,15 +1401,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1451,15 +1453,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -76,7 +76,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -1484,11 +1493,11 @@ knetbsd*-gnu)
+@@ -1536,11 +1545,11 @@ knetbsd*-gnu)
;;
netbsd*)
@@ -90,20 +90,24 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -1519,10 +1528,10 @@ nto-qnx*)
+@@ -1571,14 +1580,14 @@ nto-qnx*)
;;
openbsd*)
- version_type=sunos
+ version_type=linux
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1687,9 +1696,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1743,9 +1752,7 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
@@ -114,7 +118,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -2197,6 +2204,10 @@ hpux10.20* | hpux11*)
+@@ -2253,6 +2260,10 @@ hpux10.20* | hpux11*)
esac
;;
@@ -125,7 +129,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2424,22 +2435,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2480,22 +2491,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -149,7 +153,7 @@
# AC_LIBTOOL_F77
# --------------
# enable support for Fortran 77 libraries
-@@ -2603,7 +2602,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+@@ -2663,7 +2662,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -158,7 +162,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2935,7 +2934,7 @@ case $host_os in
+@@ -2999,7 +2998,7 @@ case $host_os in
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname`
$verstring'
_LT_AC_TAGVAR(module_cmds, $1)='$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
@@ -167,7 +171,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
;;
*)
-@@ -3093,6 +3092,16 @@ case $host_os in
+@@ -3157,6 +3156,16 @@ case $host_os in
;;
esac
;;
@@ -183,8 +187,8 @@
+ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
-@@ -3222,14 +3231,29 @@ case $host_os in
+ CC*)
+@@ -3287,14 +3296,29 @@ case $host_os in
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -216,7 +220,7 @@
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -3665,6 +3689,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3734,6 +3758,21 @@ if AC_TRY_EVAL(ac_compile); then
esac
done
@@ -238,7 +242,7 @@
# Clean up.
rm -f a.out a.exe
else
-@@ -4611,9 +4650,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4698,9 +4737,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -251,7 +255,7 @@
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -4635,6 +4676,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4722,6 +4763,10 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -262,7 +266,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -4709,6 +4754,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4796,6 +4841,8 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -270,8 +274,8 @@
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
-@@ -4880,9 +4927,11 @@ AC_MSG_CHECKING([for $compiler option to
+ CC*)
+@@ -4967,9 +5014,11 @@ AC_MSG_CHECKING([for $compiler option to
;;
darwin* | rhapsody*)
@@ -284,7 +288,7 @@
;;
msdosdjgpp*)
-@@ -4911,6 +4960,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4998,6 +5047,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -296,7 +300,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5225,6 +5279,17 @@ EOF
+@@ -5370,6 +5424,17 @@ EOF
fi
;;
@@ -314,7 +318,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'
-@@ -5528,7 +5593,7 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5633,7 +5698,7 @@ EOF
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
Home |
Main Index |
Thread Index |
Old Index