pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libtool-base Restore basename override to get th...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dfbfac904e42
branches: trunk
changeset: 533922:dfbfac904e42
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Oct 07 12:31:59 2007 +0000
description:
Restore basename override to get the name of the real compiler for the
decision making in libtool. This was lost during the update and broke
the build of shared C++ libraries with SunPro on Solaris. Bump revision
of libtool-base.
Noticed by salo and dmcmahill, tested by dmcmahill.
diffstat:
devel/libtool-base/Makefile | 4 +-
devel/libtool/patches/manual-libtool.m4 | 82 ++++++---
devel/libtool/patches/patch-ab | 249 ++++++++++++++++++++-----------
devel/libtool/patches/patch-ad | 249 ++++++++++++++++++++-----------
4 files changed, 366 insertions(+), 218 deletions(-)
diffs (truncated from 1704 to 300 lines):
diff -r ab45adcba399 -r dfbfac904e42 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Sun Oct 07 07:39:52 2007 +0000
+++ b/devel/libtool-base/Makefile Sun Oct 07 12:31:59 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2006/12/15 11:28:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.81 2007/10/07 12:32:00 joerg Exp $
###########################################################################
###########################################################################
@@ -26,7 +26,7 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff -r ab45adcba399 -r dfbfac904e42 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Sun Oct 07 07:39:52 2007 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Sun Oct 07 12:31:59 2007 +0000
@@ -1,8 +1,30 @@
-$NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.22 2007/10/07 12:31:59 joerg Exp $
+
+Local pkgsrc changes:
+- override the basename to point to the actual backend compiler,
+ critical e.g. on Solaris
+- portability fixes for print on Interix
+- override for shlib naming policy on various platforms
+- QNX support
+- Interix3 support
+- disable static linkage on OS X by default
--- libtool.m4.orig 2007-06-24 04:19:11.000000000 +0200
+++ libtool.m4
-@@ -402,11 +402,11 @@ else
+@@ -248,8 +248,11 @@ AC_DEFUN([_LT_CC_BASENAME],
+ *) break;;
+ 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-%%"`
+ ])
+
+
+ # _LT_COMPILER_BOILERPLATE
+@@ -402,11 +405,11 @@ else
if test "X$echo" = Xecho; then
# We didn't find a better echo, so look for alternatives.
@@ -16,7 +38,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.
-@@ -1351,6 +1351,7 @@ beos*)
+@@ -1351,6 +1354,7 @@ beos*)
bsdi[[45]]*)
version_type=linux
need_version=no
@@ -24,7 +46,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'
-@@ -1449,7 +1450,7 @@ freebsd1*)
+@@ -1449,7 +1453,7 @@ freebsd1*)
dynamic_linker=no
;;
@@ -33,7 +55,7 @@
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
-@@ -1463,7 +1464,7 @@ freebsd* | dragonfly*)
+@@ -1463,7 +1467,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -42,7 +64,7 @@
need_version=no
need_lib_prefix=no
;;
-@@ -1493,6 +1494,16 @@ freebsd* | dragonfly*)
+@@ -1493,6 +1497,16 @@ freebsd* | dragonfly*)
esac
;;
@@ -59,7 +81,7 @@
gnu*)
version_type=linux
need_lib_prefix=no
-@@ -1561,15 +1572,22 @@ interix[[3-9]]*)
+@@ -1561,15 +1575,22 @@ interix[[3-9]]*)
hardcode_into_libs=yes
;;
@@ -88,7 +110,7 @@
esac
need_lib_prefix=no
need_version=no
-@@ -1634,11 +1652,11 @@ linux* | k*bsd*-gnu)
+@@ -1634,11 +1655,11 @@ linux* | k*bsd*-gnu)
;;
netbsd*)
@@ -102,7 +124,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -1663,13 +1681,14 @@ nto-qnx*)
+@@ -1663,13 +1684,14 @@ nto-qnx*)
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -118,7 +140,7 @@
sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1677,7 +1696,7 @@ openbsd*)
+@@ -1677,7 +1699,7 @@ openbsd*)
openbsd3.3 | openbsd3.3.*) need_version=yes ;;
*) need_version=no ;;
esac
@@ -127,7 +149,7 @@
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
-@@ -1871,9 +1890,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1871,9 +1893,7 @@ if test -f "$ltmain" && test -n "$tagnam
case $tagname in
CXX)
@@ -138,7 +160,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -2392,6 +2409,10 @@ interix[[3-9]]*)
+@@ -2392,6 +2412,10 @@ interix[[3-9]]*)
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
@@ -149,7 +171,7 @@
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -2422,7 +2443,7 @@ newos6*)
+@@ -2422,7 +2446,7 @@ newos6*)
;;
nto-qnx*)
@@ -158,7 +180,7 @@
;;
openbsd*)
-@@ -2629,21 +2650,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2629,21 +2653,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -181,7 +203,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2781,7 +2791,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+@@ -2781,7 +2794,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -190,7 +212,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3294,6 +3304,16 @@ case $host_os in
+@@ -3294,6 +3307,16 @@ case $host_os in
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname
${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -207,7 +229,7 @@
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -3447,14 +3467,29 @@ case $host_os in
+@@ -3447,14 +3470,29 @@ case $host_os in
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -239,7 +261,7 @@
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -3767,6 +3802,11 @@ case $host_os in
+@@ -3767,6 +3805,11 @@ case $host_os in
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -251,7 +273,7 @@
*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3928,6 +3968,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3928,6 +3971,21 @@ if AC_TRY_EVAL(ac_compile); then
esac
done
@@ -273,7 +295,7 @@
# Clean up.
rm -f a.out a.exe
else
-@@ -4966,9 +5021,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4966,9 +5024,11 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -286,7 +308,7 @@
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -4994,6 +5051,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4994,6 +5054,10 @@ AC_MSG_CHECKING([for $compiler option to
;;
esac
;;
@@ -297,7 +319,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5072,6 +5133,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5072,6 +5136,8 @@ AC_MSG_CHECKING([for $compiler option to
# This is c89, which is MS Visual C++ (no shared libs)
# Anyone wants to do a port?
;;
@@ -306,7 +328,7 @@
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -5211,6 +5274,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5211,6 +5277,8 @@ AC_MSG_CHECKING([for $compiler option to
;;
vxworks*)
;;
@@ -315,7 +337,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
-@@ -5251,9 +5316,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5251,9 +5319,11 @@ AC_MSG_CHECKING([for $compiler option to
;;
darwin* | rhapsody*)
@@ -328,7 +350,7 @@
;;
interix[[3-9]]*)
-@@ -5287,6 +5354,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5287,6 +5357,11 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -340,7 +362,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
-@@ -5441,6 +5513,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5441,6 +5516,10 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -351,7 +373,7 @@
*)
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
-@@ -5719,6 +5795,17 @@ EOF
+@@ -5719,6 +5798,17 @@ EOF
fi
;;
@@ -369,7 +391,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'
-@@ -5784,6 +5871,11 @@ _LT_EOF
+@@ -5784,6 +5874,11 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -381,7 +403,7 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6139,6 +6231,21 @@ _LT_EOF
+@@ -6139,6 +6234,21 @@ _LT_EOF
fi
;;
@@ -403,7 +425,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
Home |
Main Index |
Thread Index |
Old Index