pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel In the libtool configure script, the basename of...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a7c4b859bbf6
branches: trunk
changeset: 522608:a7c4b859bbf6
user: dmcmahill <dmcmahill%pkgsrc.org@localhost>
date: Fri Dec 15 11:28:51 2006 +0000
description:
In the libtool configure script, the basename of the compiler is used
to make decisions about which compiler is being used (gcc, SunPro, etc).
To make this function "correctly" in the presence of the compiler wrapper
scripts, we need to extract the actual compiler command from the wrapper
frame work. So adapt the section in the configure script which already
attempts to deal with some other compiler wrappers to deal with the pkgsrc
wrappers.
This should address PR pkg/33467 and PR pkg/34581.
Bump PKGREVISION.
diffstat:
devel/libtool-base/Makefile | 4 +-
devel/libtool/distinfo | 6 +-
devel/libtool/patches/manual-libtool.m4 | 83 +++-----
devel/libtool/patches/patch-ab | 284 +++++++++++++++----------------
devel/libtool/patches/patch-ad | 286 +++++++++++++++----------------
5 files changed, 312 insertions(+), 351 deletions(-)
diffs (truncated from 1425 to 300 lines):
diff -r 64a8bdec3a36 -r a7c4b859bbf6 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Fri Dec 15 09:05:34 2006 +0000
+++ b/devel/libtool-base/Makefile Fri Dec 15 11:28:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2006/11/01 09:01:56 joerg Exp $
+# $NetBSD: Makefile,v 1.80 2006/12/15 11:28:52 dmcmahill Exp $
###########################################################################
###########################################################################
@@ -26,7 +26,7 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 3
+PKGREVISION= 4
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff -r 64a8bdec3a36 -r a7c4b859bbf6 devel/libtool/distinfo
--- a/devel/libtool/distinfo Fri Dec 15 09:05:34 2006 +0000
+++ b/devel/libtool/distinfo Fri Dec 15 11:28:51 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2006/08/23 19:49:12 jschauma Exp $
+$NetBSD: distinfo,v 1.69 2006/12/15 11:28:51 dmcmahill Exp $
SHA1 (libtool-1.5.22.tar.gz) = 17353e66aeaac80ae188ea0a3a90609550ce3254
RMD160 (libtool-1.5.22.tar.gz) = 7cbe793ee0509908daac928b4dc3a0f16f7293bf
Size (libtool-1.5.22.tar.gz) = 2921483 bytes
SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = e8cf42513805e70a96536c55921c230a7e5244b1
+SHA1 (patch-ab) = 146f7c6a3c4b0863246cee70f0294765472bfbc8
SHA1 (patch-ac) = 40d18dfe690ad7b76f1dae98df55fdc7e46ccd10
-SHA1 (patch-ad) = 22b871497d955b2de26a632513a11f3dd16e7286
+SHA1 (patch-ad) = 70b560a1f419938a6d93358f3f74805df13de3b1
diff -r 64a8bdec3a36 -r a7c4b859bbf6 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Fri Dec 15 09:05:34 2006 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Fri Dec 15 11:28:51 2006 +0000
@@ -1,9 +1,19 @@
-$NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.20 2006/12/15 11:28:51 dmcmahill Exp $
---- libtool.m4.orig 2005-12-18 16:53:17.000000000 -0500
-+++ libtool.m4
-@@ -392,11 +392,11 @@ else
+--- libtool.m4.orig 2005-12-18 21:53:17.000000000 +0000
++++ libtool.m4 2006-12-12 21:49:49.000000000 +0000
+@@ -249,5 +249,9 @@
+ esac
+ done
+-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
++# Return the actual command name, not our pkgsrc wrapper name because several
++# decisions are made only based on compiler names
++new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
++cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ ])
+@@ -393,9 +397,9 @@
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -15,17 +25,13 @@
+ echo='print -r -'
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.
-@@ -1289,6 +1289,7 @@ beos*)
- bsdi[[45]]*)
+@@ -1290,4 +1294,5 @@
version_type=linux
need_version=no
+ need_lib_prefix=no
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'
-@@ -1414,15 +1415,16 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
+@@ -1415,13 +1420,14 @@
esac
fi
- version_type=freebsd-$objformat
@@ -46,18 +52,14 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
need_version=yes
;;
- esac
-@@ -1440,7 +1442,7 @@ freebsd* | dragonfly*)
- shlibpath_overrides_runpath=no
+@@ -1441,5 +1447,5 @@
hardcode_into_libs=yes
;;
- freebsd*) # from 4.6 on
+ *) # from 4.6 on, and DragonFly
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- ;;
-@@ -1518,12 +1520,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -1519,10 +1525,5 @@
case $host_os in
nonstopux*) version_type=nonstopux ;;
- *)
@@ -69,9 +71,7 @@
+ *) version_type=irix ;;
esac
need_lib_prefix=no
- need_version=no
-@@ -1600,11 +1597,11 @@ knetbsd*-gnu)
- ;;
+@@ -1601,9 +1602,9 @@
netbsd*)
- version_type=sunos
@@ -83,27 +83,21 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
- else
-@@ -1635,7 +1632,7 @@ nto-qnx*)
- ;;
+@@ -1636,5 +1637,5 @@
openbsd*)
- version_type=sunos
+ version_type=linux
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1643,7 +1640,7 @@ openbsd*)
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -1644,5 +1645,5 @@
*) 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
-@@ -1832,9 +1829,7 @@ if test -f "$ltmain" && test -n "$tagnam
-
+@@ -1833,7 +1834,5 @@
case $tagname in
CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -112,9 +106,7 @@
+ if test -n "$CXX" && test "X$CXX" != "Xno"; then
AC_LIBTOOL_LANG_CXX_CONFIG
else
- tagname=""
-@@ -2580,22 +2575,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
- # ---------------
+@@ -2581,20 +2580,8 @@
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
@@ -136,27 +128,21 @@
-
# AC_LIBTOOL_F77
# --------------
- # enable support for Fortran 77 libraries
-@@ -2732,7 +2715,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+@@ -2733,5 +2720,5 @@
[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)=
-@@ -3080,7 +3063,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'
+@@ -3081,5 +3068,5 @@
_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 lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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}'
_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}'
;;
- *)
-@@ -3377,14 +3360,29 @@ case $host_os in
- ;;
+@@ -3378,12 +3365,27 @@
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ # a.out is quite broken and goes directly to ld
@@ -186,9 +172,7 @@
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
openbsd2*)
- # C++ shared libraries are fairly broken
-@@ -3872,6 +3870,12 @@ interix3*)
- _LT_AC_TAGVAR(postdeps,$1)=
+@@ -3873,4 +3875,10 @@
;;
+netbsd*)
@@ -199,9 +183,7 @@
+
solaris*)
case $cc_basename in
- CC*)
-@@ -4847,9 +4851,11 @@ AC_MSG_CHECKING([for $compiler option to
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -4848,7 +4856,9 @@
;;
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -212,9 +194,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
;;
*djgpp*)
- # DJGPP does not support shared libraries at all
-@@ -5122,9 +5128,11 @@ AC_MSG_CHECKING([for $compiler option to
- ;;
+@@ -5123,7 +5133,9 @@
darwin* | rhapsody*)
- # PIC is the default on this platform
@@ -225,13 +205,10 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
;;
- interix3*)
-@@ -5850,7 +5858,7 @@ _LT_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'
+@@ -5851,5 +5863,5 @@
_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 lds
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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}'
_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}'
;;
- *)
diff -r 64a8bdec3a36 -r a7c4b859bbf6 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab Fri Dec 15 09:05:34 2006 +0000
+++ b/devel/libtool/patches/patch-ab Fri Dec 15 11:28:51 2006 +0000
@@ -1,17 +1,14 @@
-$NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
+$NetBSD: patch-ab,v 1.58 2006/12/15 11:28:51 dmcmahill Exp $
---- configure.orig 2006-02-06 13:54:53.000000000 -0500
-+++ configure
-@@ -76,7 +76,6 @@ if test "x$as_myself" = x; then
- as_myself=$0
+--- configure.orig 2005-12-18 22:13:49.000000000 +0000
++++ configure 2006-12-12 21:54:12.000000000 +0000
+@@ -77,5 +77,4 @@
fi
if test ! -f "$as_myself"; then
- # FIXME: next line outputs $as_me, which is still unset.
{ echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }; }
- fi
-@@ -589,11 +588,11 @@ else
-
+@@ -590,9 +589,9 @@
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -23,9 +20,7 @@
+ echo='print -r -'
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.
-@@ -1918,8 +1917,7 @@ esac
- ## ------------------------ ##
+@@ -1919,6 +1918,5 @@
## Automake Initialisation. ##
## ------------------------ ##
-am__api_version='1.9a'
@@ -33,9 +28,7 @@
+am__api_version="1.9"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
-@@ -2096,30 +2094,26 @@ echo "$as_me: WARNING: \`missing' script
- fi
+@@ -2097,28 +2095,24 @@
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to define $(mkdir_p) as `mkdir -p -- .', in order to
@@ -78,27 +71,21 @@
+ # exists.
for d in ./-p ./--version;
do
- test -d $d && rmdir $d
-@@ -2260,7 +2254,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
-
+@@ -2261,5 +2255,5 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
-@@ -2360,7 +2354,7 @@ else
- fi
+@@ -2361,5 +2355,5 @@
Home |
Main Index |
Thread Index |
Old Index