kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix completely hosed test for g++ when CXX=g++. The old test worked fine.

Browse source 
Revert until the hosage is tracked down and eliminated at the source.

(Bump to libtool-1.5.10nb1, and make this the required version.)
This commit is contained in:
tv 2004-10-04 19:48:09 +00:00
parent b339673bcc
commit 4bee2600f9
7 changed files with 219 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
devel/libtool-base/Makefile
View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.39 2004/10/03 00:13:31 tv Exp $
# $NetBSD: Makefile,v 1.40 2004/10/04 19:48:10 tv Exp $
#
PKGNAME= ${DISTNAME:C/-/-base-/}
PKGREVISION= 1
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
@ -21,13 +22,15 @@ TEST_TARGET= check
.if ${OPSYS} == "NetBSD"
. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
CONFIGURE_ARGS= --disable-shared
CONFIGURE_ARGS+= --disable-shared
BUILD_SHLIBTOOL= NO
. endif
.else
CONFIGURE_ARGS= --enable-ltdl-install
CONFIGURE_ARGS+= --enable-ltdl-install
.endif
CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ
# The configure script persists in trying to find the path to ld, which
# always ends up in ${BUILDLINK_DIR}. Prevent it from caring.
#

6
devel/libtool/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.45 2004/10/03 00:13:31 tv Exp $
$NetBSD: distinfo,v 1.46 2004/10/04 19:48:09 tv 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) = b6602584eb17c343838af13c706961ffeae7745a
SHA1 (patch-ab) = 7b6db6dc7f57bd5425542e156308793a52729c58
SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
SHA1 (patch-ad) = 10c4330056c6a7c20bff0ed81407c21a5ac00b32
SHA1 (patch-ad) = a2d0742ff45539b06c346b8bee8e04645441e266

67
devel/libtool/patches/manual-libtool.m4
View file

@ -1,4 +1,4 @@
$NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
$NetBSD: manual-libtool.m4,v 1.6 2004/10/04 19:48:09 tv Exp $
--- libtool.m4.orig 2004-09-19 08:15:08.000000000 -0400
+++ libtool.m4
@ -90,7 +90,18 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
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
@@ -2198,6 +2207,10 @@ hpux10.20* | hpux11*)
@@ -1688,9 +1697,7 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && test "X$CXX" != "Xno"; then
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
@@ -2198,6 +2205,10 @@ hpux10.20* | hpux11*)
esac
;;
@ -101,7 +112,39 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -3091,6 +3104,8 @@ case $host_os in
@@ -2425,21 +2436,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXXCPP])
_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
])# _LT_AC_LANG_CXX
-# _LT_AC_PROG_CXXCPP
-# ---------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
# AC_LIBTOOL_F77
# --------------
@@ -2604,7 +2604,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+AC_REQUIRE([AC_PROG_CXXCPP])
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -3091,6 +3091,8 @@ case $host_os in
;;
esac
;;
@ -110,7 +153,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
irix5* | irix6*)
case $cc_basename in
CC)
@@ -3210,6 +3225,13 @@ case $host_os in
@@ -3210,6 +3212,13 @@ case $host_os in
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@ -124,7 +167,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3651,6 +3673,14 @@ if AC_TRY_EVAL(ac_compile); then
@@ -3651,6 +3660,14 @@ if AC_TRY_EVAL(ac_compile); then
esac
done
@ -139,7 +182,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
# Clean up.
rm -f a.out a.exe
else
@@ -4591,9 +4621,11 @@ AC_MSG_CHECKING([for $compiler option to
@@ -4591,9 +4608,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@ -152,7 +195,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
@@ -4615,6 +4647,10 @@ AC_MSG_CHECKING([for $compiler option to
@@ -4615,6 +4634,10 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@ -163,7 +206,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
@@ -4689,6 +4725,8 @@ AC_MSG_CHECKING([for $compiler option to
@@ -4689,6 +4712,8 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@ -172,7 +215,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
@@ -4854,9 +4892,11 @@ AC_MSG_CHECKING([for $compiler option to
@@ -4854,9 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to
;;
darwin* | rhapsody*)
@ -185,7 +228,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -4885,6 +4925,11 @@ AC_MSG_CHECKING([for $compiler option to
@@ -4885,6 +4912,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@ -197,7 +240,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
@@ -5187,6 +5232,17 @@ EOF
@@ -5187,6 +5219,17 @@ EOF
fi
;;
@ -215,7 +258,7 @@ $NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
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'
@@ -5592,6 +5648,20 @@ $echo "local: *; };" >> $output_objdir/$
@@ -5592,6 +5635,20 @@ $echo "local: *; };" >> $output_objdir/$
fi
;;

10
devel/libtool/patches/manual.README
View file

@ -1,4 +1,4 @@
$NetBSD: manual.README,v 1.4 2004/09/27 14:40:58 tv Exp $
$NetBSD: manual.README,v 1.5 2004/10/04 19:48:09 tv Exp $
The "manual-*" patch files are used to maintain the pkgsrc version of
libtool. These files contain patches for the .m4 files in libtool which are
@ -18,6 +18,7 @@ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s
[edit *.m4 files and put patches back to manual-*]
./configure
make ./configure
pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
cp -f acinclude.m4 libltdl/
@ -25,8 +26,11 @@ cp -f acinclude.m4 libltdl/
pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
cd /usr/pkgsrc/devel/libtool
make makepatchsum
cvs commit
[clean and test new libtool-base]
[bump PKGREVISION of libtool-base and commit libtool & libtool-base dirs]
=====
- tv@duh.org, 20 Apr 2004
- tv@duh.org, 4 Oct 2004

112
devel/libtool/patches/patch-ab
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
$NetBSD: patch-ab,v 1.41 2004/10/04 19:48:09 tv Exp $
--- configure.orig 2004-09-19 08:22:04.000000000 -0400
+++ configure
@ -13,7 +13,30 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -6909,9 +6913,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -5690,12 +5694,7 @@ fi
done
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5925,8 +5924,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-fi
-
@@ -6909,9 +6906,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -26,7 +49,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -6940,6 +6946,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -6940,6 +6939,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -38,7 +61,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic='-fPIC'
;;
@@ -7325,6 +7336,17 @@ EOF
@@ -7325,6 +7329,17 @@ EOF
fi
;;
@ -56,7 +79,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7832,6 +7854,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -7832,6 +7847,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -77,7 +100,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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'
@@ -8223,6 +8259,7 @@ beos*)
@@ -8223,6 +8252,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -85,7 +108,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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'
@@ -8337,16 +8374,17 @@ kfreebsd*-gnu)
@@ -8337,16 +8367,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -109,7 +132,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -8422,15 +8460,22 @@ hpux9* | hpux10* | hpux11*)
@@ -8422,15 +8453,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -138,7 +161,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -8507,11 +8552,11 @@ knetbsd*-gnu)
@@ -8507,11 +8545,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -152,7 +175,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8542,10 +8587,10 @@ nto-qnx*)
@@ -8542,10 +8580,10 @@ nto-qnx*)
;;
openbsd*)
@ -165,7 +188,18 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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
@@ -10817,6 +10862,8 @@ if test -z "$aix_libpath"; then aix_libp
@@ -10105,9 +10143,7 @@ echo "$as_me: error: tag name \"$tagname
case $tagname in
CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && test "X$CXX" != "Xno"; then
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10817,6 +10853,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@ -174,7 +208,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
irix5* | irix6*)
case $cc_basename in
CC)
@@ -10936,6 +10983,13 @@ if test -z "$aix_libpath"; then aix_libp
@@ -10936,6 +10974,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=
@ -188,7 +222,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
@@ -11324,6 +11378,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
@@ -11324,6 +11369,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@ -203,7 +237,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
# Clean up.
rm -f a.out a.exe
else
@@ -11371,9 +11433,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -11371,9 +11424,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@ -216,7 +250,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
@@ -11395,6 +11459,10 @@ echo $ECHO_N "checking for $compiler opt
@@ -11395,6 +11450,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@ -227,7 +261,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
@@ -11469,6 +11537,8 @@ echo $ECHO_N "checking for $compiler opt
@@ -11469,6 +11528,8 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@ -236,7 +270,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
@@ -11939,6 +12009,7 @@ beos*)
@@ -11939,6 +12000,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -244,7 +278,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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'
@@ -12053,16 +12124,17 @@ kfreebsd*-gnu)
@@ -12053,16 +12115,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -268,7 +302,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -12138,15 +12210,22 @@ hpux9* | hpux10* | hpux11*)
@@ -12138,15 +12201,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -297,7 +331,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -12223,11 +12302,11 @@ knetbsd*-gnu)
@@ -12223,11 +12293,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -311,7 +345,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -12258,10 +12337,10 @@ nto-qnx*)
@@ -12258,10 +12328,10 @@ nto-qnx*)
;;
openbsd*)
@ -324,7 +358,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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
@@ -13805,9 +13884,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -13805,9 +13875,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -337,7 +371,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -13836,6 +13917,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -13836,6 +13908,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -349,7 +383,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
@@ -14221,6 +14307,17 @@ EOF
@@ -14221,6 +14298,17 @@ EOF
fi
;;
@ -367,7 +401,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -14708,6 +14805,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -14708,6 +14796,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -388,7 +422,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_F77='$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'
@@ -15099,6 +15210,7 @@ beos*)
@@ -15099,6 +15201,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -396,7 +430,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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'
@@ -15213,16 +15325,17 @@ kfreebsd*-gnu)
@@ -15213,16 +15316,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -420,7 +454,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -15298,15 +15411,22 @@ hpux9* | hpux10* | hpux11*)
@@ -15298,15 +15402,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -449,7 +483,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -15383,11 +15503,11 @@ knetbsd*-gnu)
@@ -15383,11 +15494,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -463,7 +497,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15418,10 +15538,10 @@ nto-qnx*)
@@ -15418,10 +15529,10 @@ nto-qnx*)
;;
openbsd*)
@ -476,7 +510,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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
@@ -16147,9 +16267,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -16147,9 +16258,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -489,7 +523,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -16178,6 +16300,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -16178,6 +16291,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -501,7 +535,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
@@ -16563,6 +16690,17 @@ EOF
@@ -16563,6 +16681,17 @@ EOF
fi
;;
@ -519,7 +553,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -17070,6 +17208,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -17070,6 +17199,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -540,7 +574,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_GCJ='$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'
@@ -17461,6 +17613,7 @@ beos*)
@@ -17461,6 +17604,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -548,7 +582,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
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'
@@ -17575,16 +17728,17 @@ kfreebsd*-gnu)
@@ -17575,16 +17719,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -572,7 +606,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -17660,15 +17814,22 @@ hpux9* | hpux10* | hpux11*)
@@ -17660,15 +17805,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -601,7 +635,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -17745,11 +17906,11 @@ knetbsd*-gnu)
@@ -17745,11 +17897,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -615,7 +649,7 @@ $NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -17780,10 +17941,10 @@ nto-qnx*)
@@ -17780,10 +17932,10 @@ nto-qnx*)
;;
openbsd*)

112
devel/libtool/patches/patch-ad
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
$NetBSD: patch-ad,v 1.14 2004/10/04 19:48:09 tv Exp $
--- libltdl/configure.orig 2004-09-19 08:23:09.000000000 -0400
+++ libltdl/configure
@ -13,7 +13,30 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
@@ -6814,9 +6818,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -5359,12 +5363,7 @@ else
fi
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- ac_ext=cc
+ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5594,8 +5593,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-fi
-
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -6814,9 +6811,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -26,7 +49,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -6845,6 +6851,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -6845,6 +6844,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -38,7 +61,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic='-fPIC'
;;
@@ -7230,6 +7241,17 @@ EOF
@@ -7230,6 +7234,17 @@ EOF
fi
;;
@ -56,7 +79,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7737,6 +7759,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -7737,6 +7752,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -77,7 +100,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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'
@@ -8128,6 +8164,7 @@ beos*)
@@ -8128,6 +8157,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -85,7 +108,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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'
@@ -8242,16 +8279,17 @@ kfreebsd*-gnu)
@@ -8242,16 +8272,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -109,7 +132,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -8327,15 +8365,22 @@ hpux9* | hpux10* | hpux11*)
@@ -8327,15 +8358,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -138,7 +161,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -8412,11 +8457,11 @@ knetbsd*-gnu)
@@ -8412,11 +8450,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -152,7 +175,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8447,10 +8492,10 @@ nto-qnx*)
@@ -8447,10 +8485,10 @@ nto-qnx*)
;;
openbsd*)
@ -165,7 +188,18 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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
@@ -10722,6 +10767,8 @@ if test -z "$aix_libpath"; then aix_libp
@@ -10010,9 +10048,7 @@ echo "$as_me: error: tag name \"$tagname
case $tagname in
CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+ if test -n "$CXX" && test "X$CXX" != "Xno"; then
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10722,6 +10758,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@ -174,7 +208,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
irix5* | irix6*)
case $cc_basename in
CC)
@@ -10841,6 +10888,13 @@ if test -z "$aix_libpath"; then aix_libp
@@ -10841,6 +10879,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=
@ -188,7 +222,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
@@ -11229,6 +11283,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
@@ -11229,6 +11274,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@ -203,7 +237,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
# Clean up.
rm -f a.out a.exe
else
@@ -11276,9 +11338,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -11276,9 +11329,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@ -216,7 +250,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
@@ -11300,6 +11364,10 @@ echo $ECHO_N "checking for $compiler opt
@@ -11300,6 +11355,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@ -227,7 +261,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
@@ -11374,6 +11442,8 @@ echo $ECHO_N "checking for $compiler opt
@@ -11374,6 +11433,8 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@ -236,7 +270,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
@@ -11844,6 +11914,7 @@ beos*)
@@ -11844,6 +11905,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -244,7 +278,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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'
@@ -11958,16 +12029,17 @@ kfreebsd*-gnu)
@@ -11958,16 +12020,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -268,7 +302,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -12043,15 +12115,22 @@ hpux9* | hpux10* | hpux11*)
@@ -12043,15 +12106,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -297,7 +331,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -12128,11 +12207,11 @@ knetbsd*-gnu)
@@ -12128,11 +12198,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -311,7 +345,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -12163,10 +12242,10 @@ nto-qnx*)
@@ -12163,10 +12233,10 @@ nto-qnx*)
;;
openbsd*)
@ -324,7 +358,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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
@@ -13710,9 +13789,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -13710,9 +13780,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -337,7 +371,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -13741,6 +13822,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -13741,6 +13813,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -349,7 +383,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
@@ -14126,6 +14212,17 @@ EOF
@@ -14126,6 +14203,17 @@ EOF
fi
;;
@ -367,7 +401,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -14613,6 +14710,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -14613,6 +14701,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -388,7 +422,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_F77='$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'
@@ -15004,6 +15115,7 @@ beos*)
@@ -15004,6 +15106,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -396,7 +430,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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'
@@ -15118,16 +15230,17 @@ kfreebsd*-gnu)
@@ -15118,16 +15221,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -420,7 +454,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -15203,15 +15316,22 @@ hpux9* | hpux10* | hpux11*)
@@ -15203,15 +15307,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -449,7 +483,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -15288,11 +15408,11 @@ knetbsd*-gnu)
@@ -15288,11 +15399,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -463,7 +497,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -15323,10 +15443,10 @@ nto-qnx*)
@@ -15323,10 +15434,10 @@ nto-qnx*)
;;
openbsd*)
@ -476,7 +510,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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
@@ -16052,9 +16172,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -16052,9 +16163,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@ -489,7 +523,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
;;
msdosdjgpp*)
@@ -16083,6 +16205,11 @@ echo $ECHO_N "checking for $compiler opt
@@ -16083,6 +16196,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@ -501,7 +535,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
@@ -16468,6 +16595,17 @@ EOF
@@ -16468,6 +16586,17 @@ EOF
fi
;;
@ -519,7 +553,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -16975,6 +17113,20 @@ if test -z "$aix_libpath"; then aix_libp
@@ -16975,6 +17104,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@ -540,7 +574,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_GCJ='$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'
@@ -17366,6 +17518,7 @@ beos*)
@@ -17366,6 +17509,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@ -548,7 +582,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
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'
@@ -17480,16 +17633,17 @@ kfreebsd*-gnu)
@@ -17480,16 +17624,17 @@ kfreebsd*-gnu)
;;
freebsd*)
@ -572,7 +606,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
need_version=yes
;;
esac
@@ -17565,15 +17719,22 @@ hpux9* | hpux10* | hpux11*)
@@ -17565,15 +17710,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@ -601,7 +635,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
esac
need_lib_prefix=no
need_version=no
@@ -17650,11 +17811,11 @@ knetbsd*-gnu)
@@ -17650,11 +17802,11 @@ knetbsd*-gnu)
;;
netbsd*)
@ -615,7 +649,7 @@ $NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -17685,10 +17846,10 @@ nto-qnx*)
@@ -17685,10 +17837,10 @@ nto-qnx*)
;;
openbsd*)

4
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.1506 2004/10/03 04:24:20 hira Exp $
# $NetBSD: bsd.pkg.mk,v 1.1507 2004/10/04 19:48:09 tv Exp $
#
# This file is in the public domain.
#
@ -390,7 +390,7 @@ CONFIGURE_ENV+= install_sh=${INSTALL:Q}
.if defined(_OPSYS_LIBTOOL_REQD)
LIBTOOL_REQD= ${_OPSYS_LIBTOOL_REQD}
.else
LIBTOOL_REQD?= 1.5.10
LIBTOOL_REQD?= 1.5.10nb1
.endif
#
# PKG_LIBTOOL is the path to the libtool script installed by libtool-base.