diff options
| -rw-r--r-- | devel/libltdl/Makefile | 8 | ||||
| -rw-r--r-- | devel/libltdl/PLIST | 5 | ||||
| -rw-r--r-- | devel/libltdl/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/libtool-base/Makefile | 5 | ||||
| -rw-r--r-- | devel/libtool-base/PLIST | 49 | ||||
| -rw-r--r-- | devel/libtool-info/Makefile | 12 | ||||
| -rw-r--r-- | devel/libtool/Makefile | 12 | ||||
| -rw-r--r-- | devel/libtool/Makefile.common | 5 | ||||
| -rw-r--r-- | devel/libtool/PLIST | 2 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 17 | ||||
| -rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 440 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-aa | 31 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 976 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 185 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ad | 1085 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ae | 93 | ||||
| -rw-r--r-- | mk/compiler/f2c.mk | 31 |
17 files changed, 661 insertions, 2299 deletions
diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile index efdba383df5..0a735181a3c 100644 --- a/devel/libltdl/Makefile +++ b/devel/libltdl/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2009/12/15 17:07:43 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2009/12/15 17:35:36 joerg Exp $ # .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/tool-/ltdl-/} -PKGREVISION= 1 SVR4_PKGNAME= lltdl COMMENT= Generic shared library support (libltdl abstraction library) @@ -13,8 +12,9 @@ CONFLICTS+= libtool<=1.3.5nb11 libtool-base<=1.5.10nb4 USE_LIBTOOL= yes -CONFIGURE_ARGS+=--enable-libltdl-install -BUILD_DIRS= ${WRKSRC}/libltdl +CONFIGURE_ARGS+=--enable-ltdl-install + +CONFIGURE_DIRS= libltdl .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libltdl/PLIST b/devel/libltdl/PLIST index c76c7c9f0a6..824244e8cac 100644 --- a/devel/libltdl/PLIST +++ b/devel/libltdl/PLIST @@ -1,3 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/14 19:03:45 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/12/15 17:35:36 joerg Exp $ +include/libltdl/lt_dlloader.h +include/libltdl/lt_error.h +include/libltdl/lt_system.h include/ltdl.h lib/libltdl.la diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk index dc6c63bb6e6..009b89b6d50 100644 --- a/devel/libltdl/buildlink3.mk +++ b/devel/libltdl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:20 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/12/15 17:35:36 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "NetBSD" @@ -14,7 +14,7 @@ BUILDLINK_TREE+= libltdl .if !defined(LIBLTDL_BUILDLINK3_MK) LIBLTDL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libltdl+= libltdl>=1.5.10 +BUILDLINK_API_DEPENDS.libltdl+= libltdl>=2.2.6 BUILDLINK_PKGSRCDIR.libltdl?= ../../devel/libltdl .include "../../mk/dlopen.buildlink3.mk" diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 971208e17a6..caa4e19b92d 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2009/07/08 21:01:44 markd Exp $ +# $NetBSD: Makefile,v 1.88 2009/12/15 17:35:37 joerg Exp $ ########################################################################### ########################################################################### @@ -26,7 +26,6 @@ .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 2 SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) @@ -64,7 +63,7 @@ BUILD_SHLIBTOOL?= YES # and Fortran compilers. # USE_LANGUAGES= c c++ fortran -CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ +CONFIGURE_ARGS+= --disable-ltdl-install USE_TOOLS+= echo diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST index 08f46f4fe44..19db64787f0 100644 --- a/devel/libtool-base/PLIST +++ b/devel/libtool-base/PLIST @@ -1,26 +1,53 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:48:56 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2009/12/15 17:35:37 joerg Exp $ bin/libtool bin/libtoolize ${PLIST.shlibtool}bin/shlibtool +share/aclocal/argz.m4 share/aclocal/libtool.m4 share/aclocal/ltdl.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/install-sh +share/aclocal/ltoptions.m4 +share/aclocal/ltsugar.m4 +share/aclocal/ltversion.m4 +share/aclocal/lt~obsolete.m4 +share/libtool/config/compile +share/libtool/config/config.guess +share/libtool/config/config.sub +share/libtool/config/depcomp +share/libtool/config/install-sh +share/libtool/config/ltmain.sh +share/libtool/config/missing share/libtool/libltdl/COPYING.LIB share/libtool/libltdl/Makefile.am share/libtool/libltdl/Makefile.in +share/libtool/libltdl/Makefile.inc share/libtool/libltdl/README -share/libtool/libltdl/acinclude.m4 share/libtool/libltdl/aclocal.m4 +share/libtool/libltdl/argz.c +share/libtool/libltdl/argz_.h share/libtool/libltdl/config-h.in -share/libtool/libltdl/config.guess -share/libtool/libltdl/config.sub share/libtool/libltdl/configure share/libtool/libltdl/configure.ac -share/libtool/libltdl/install-sh +share/libtool/libltdl/libltdl/lt__alloc.h +share/libtool/libltdl/libltdl/lt__dirent.h +share/libtool/libltdl/libltdl/lt__glibc.h +share/libtool/libltdl/libltdl/lt__private.h +share/libtool/libltdl/libltdl/lt__strl.h +share/libtool/libltdl/libltdl/lt_dlloader.h +share/libtool/libltdl/libltdl/lt_error.h +share/libtool/libltdl/libltdl/lt_system.h +share/libtool/libltdl/libltdl/slist.h +share/libtool/libltdl/loaders/dld_link.c +share/libtool/libltdl/loaders/dlopen.c +share/libtool/libltdl/loaders/dyld.c +share/libtool/libltdl/loaders/load_add_on.c +share/libtool/libltdl/loaders/loadlibrary.c +share/libtool/libltdl/loaders/preopen.c +share/libtool/libltdl/loaders/shl_load.c +share/libtool/libltdl/lt__alloc.c +share/libtool/libltdl/lt__dirent.c +share/libtool/libltdl/lt__strl.c +share/libtool/libltdl/lt_dlloader.c +share/libtool/libltdl/lt_error.c share/libtool/libltdl/ltdl.c share/libtool/libltdl/ltdl.h -share/libtool/libltdl/ltmain.sh -share/libtool/libltdl/missing -share/libtool/ltmain.sh +share/libtool/libltdl/slist.c diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile index 65f8d4e5414..83163cc4f19 100644 --- a/devel/libtool-info/Makefile +++ b/devel/libtool-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/11/01 08:59:03 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2009/12/15 17:35:37 joerg Exp $ # .include "../../devel/libtool/Makefile.common" @@ -13,6 +13,14 @@ CONFLICTS+= libtool<1.3.5nb11 USE_TOOLS+= makeinfo INFO_FILES= # PLIST -BUILD_DIRS= doc +NO_CONFIGURE= yes + +INSTALLATION_DIRS= ${PKGINFODIR} + +do-build: + cd ${WRKSRC}/doc && ${MAKEINFO} --no-split libtool.texi + +do-install: + ${INSTALL_DATA} ${WRKSRC}/doc/libtool.info ${DESTDIR}${PREFIX}/${PKGINFODIR} .include "../../mk/bsd.pkg.mk" diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index b5ecb3efb0b..36b13033e1e 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.44 2005/07/19 10:20:07 grant Exp $ +# $NetBSD: Makefile,v 1.45 2009/12/15 17:35:36 joerg Exp $ + +META_PACKAGE= # empty .include "Makefile.common" @@ -12,12 +14,4 @@ DEPENDS+= ${DISTNAME:S/-/-info-/}{,nb[0-9]*}:../../devel/libtool-info COMMENT= Generic shared library support script -NO_CONFIGURE= yes -NO_BUILD= yes - -do-patch: - -do-install: - @${ECHO_MSG} this is only a meta package. - .include "../../mk/bsd.pkg.mk" diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index ba2b17f9386..e5c119d84a2 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.76 2009/06/13 06:46:43 rillig Exp $ +# $NetBSD: Makefile.common,v 1.77 2009/12/15 17:35:36 joerg Exp $ # used by devel/libltdl/Makefile # used by devel/libtool-base/Makefile # used by devel/libtool-info/Makefile @@ -26,7 +26,8 @@ ########################################################################### ########################################################################### -DISTNAME= libtool-1.5.26 +DISTNAME= libtool-2.2.6b +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} diff --git a/devel/libtool/PLIST b/devel/libtool/PLIST index 580bdeb86ba..e69de29bb2d 100644 --- a/devel/libtool/PLIST +++ b/devel/libtool/PLIST @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:46 zuntum Exp $ -@comment empty diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 436077df600..c9e4a0d6cdd 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.75 2009/12/15 17:07:43 joerg Exp $ +$NetBSD: distinfo,v 1.76 2009/12/15 17:35:36 joerg Exp $ -SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a -RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11 -Size (libtool-1.5.26.tar.gz) = 2961939 bytes -SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6 -SHA1 (patch-ab) = 271e58419f0581f02b69094e865c16126b554f7b -SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70 -SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66 -SHA1 (patch-ae) = 958897656acd515487ddb0ae66cbc95e8531fbc4 +SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 +RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef +Size (libtool-2.2.6b.tar.gz) = 2347317 bytes +SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751 +SHA1 (patch-ab) = e7664e0d958f9504381d281293afb2628bb26678 +SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65 +SHA1 (patch-ad) = e79850d8aa270b1679b873255944d0967c6d7f34 diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 2413f9bd785..c29f596e0ee 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,45 +1,20 @@ -$NetBSD: manual-libtool.m4,v 1.26 2009/07/08 21:01:43 markd Exp $ +$NetBSD: manual-libtool.m4,v 1.27 2009/12/15 17:35:37 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 -- DragonFly support decoupled from FreeBSD -- support g95 on NetBSD - ---- libtool.m4.orig 2008-02-02 05:26:47.000000000 +1300 -+++ libtool.m4 -@@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME], +--- libltdl/m4/libtool.m4.orig 2008-09-05 13:54:41.000000000 +0200 ++++ libltdl/m4/libtool.m4 +@@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ]) -@@ -474,11 +477,11 @@ else - - 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' && -+ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. -- echo='print -r' -+ 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. -@@ -820,6 +823,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d +@@ -1527,6 +1530,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d lt_cv_sys_max_cmd_len=8192; ;; @@ -53,7 +28,7 @@ Local pkgsrc changes: amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. -@@ -1427,6 +1437,7 @@ beos*) +@@ -2189,6 +2199,7 @@ beos*) bsdi[[45]]*) version_type=linux need_version=no @@ -61,7 +36,7 @@ Local pkgsrc changes: 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' -@@ -1525,9 +1536,7 @@ freebsd1*) +@@ -2290,9 +2301,7 @@ freebsd1*) dynamic_linker=no ;; @@ -72,7 +47,7 @@ Local pkgsrc changes: if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -1539,7 +1548,7 @@ freebsd* | dragonfly*) +@@ -2304,7 +2313,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -81,7 +56,7 @@ Local pkgsrc changes: need_version=no need_lib_prefix=no ;; -@@ -1562,13 +1571,24 @@ freebsd* | dragonfly*) +@@ -2327,13 +2336,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -107,22 +82,7 @@ Local pkgsrc changes: gnu*) version_type=linux need_lib_prefix=no -@@ -1637,15 +1657,22 @@ interix[[3-9]]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -2405,12 +2425,7 @@ interix[[3-9]]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -136,7 +96,7 @@ Local pkgsrc changes: esac need_lib_prefix=no need_version=no -@@ -1710,11 +1737,11 @@ linux* | k*bsd*-gnu) +@@ -2486,15 +2501,14 @@ linux* | k*bsd*-gnu) ;; netbsd*) @@ -144,20 +104,17 @@ Local pkgsrc changes: + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -1739,13 +1766,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -2523,7 +2537,7 @@ newsos6) ;; openbsd*) @@ -166,170 +123,33 @@ Local pkgsrc changes: sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -1753,7 +1781,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -2531,7 +2545,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -1954,9 +1982,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="" -@@ -2475,6 +2501,10 @@ interix[[3-9]]*) - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' - ;; - -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -2505,7 +2535,7 @@ newos6*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -3091,7 +3105,7 @@ newos6*) ;; - nto-qnx*) -- lt_cv_deplibs_check_method=unknown + *nto* | *qnx*) +- lt_cv_deplibs_check_method=pass_all + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$' ;; openbsd*) -@@ -2712,21 +2742,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 - # -------------- -@@ -2864,7 +2883,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)= -@@ -3350,6 +3369,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' - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -3503,14 +3532,29 @@ case $host_os in - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ # a.out is quite broken and goes directly to ld - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -+ # Determine if we need to override the c++rt0 that is -+ # picked up by analysing output_verbose_link_cmds -+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then -+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" -+ else -+ cpprt0_file= -+ fi - _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 -- fi -- # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then -+ # Workaround some broken pre-1.5 ELF toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ else -+ # Modern ELF works sanely as-is -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' -+ fi - ;; - openbsd2*) - # C++ shared libraries are fairly broken -@@ -3823,6 +3867,11 @@ case $host_os in - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -+ nto-qnx*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' -+ ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -3985,6 +4034,21 @@ if AC_TRY_EVAL(ac_compile); then - esac - done - -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac -+ - # Clean up. - rm -f a.out a.exe - else -@@ -5033,9 +5097,15 @@ AC_MSG_CHECKING([for $compiler option to - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) +@@ -3580,9 +3594,15 @@ m4_if([$1], [CXX], [ + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; 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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='' + ;; + *mint*) @@ -338,18 +158,7 @@ Local pkgsrc changes: ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -5061,6 +5131,10 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; -@@ -5107,6 +5181,9 @@ AC_MSG_CHECKING([for $compiler option to +@@ -3650,6 +3670,9 @@ m4_if([$1], [CXX], [ ;; esac ;; @@ -359,25 +168,7 @@ Local pkgsrc changes: freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; -@@ -5139,6 +5216,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? - ;; -+ interix3*) -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -5278,6 +5357,8 @@ AC_MSG_CHECKING([for $compiler option to - ;; - vxworks*) - ;; -+ nto-qnx*) -+ ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; -@@ -5319,9 +5400,11 @@ AC_MSG_CHECKING([for $compiler option to +@@ -3888,9 +3911,11 @@ m4_if([$1], [CXX], [ ;; darwin* | rhapsody*) @@ -385,12 +176,12 @@ Local pkgsrc changes: + # 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_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='' ;; - interix[[3-9]]*) -@@ -5329,6 +5412,13 @@ AC_MSG_CHECKING([for $compiler option to + hpux*) +@@ -3912,6 +3937,13 @@ m4_if([$1], [CXX], [ # Instead, we relocate shared libraries at runtime. ;; @@ -404,105 +195,96 @@ Local pkgsrc changes: msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -5355,6 +5445,11 @@ AC_MSG_CHECKING([for $compiler option to - esac - ;; - -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; -@@ -5510,6 +5605,10 @@ AC_MSG_CHECKING([for $compiler option to - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - -+ nto-qnx*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; -@@ -5534,6 +5633,9 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi - fi +@@ -4110,6 +4142,9 @@ m4_if([$1], [CXX], [ + ]) case $host_os in # For platforms which do not support PIC, -DPIC is meaningless: + mint*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; -@@ -5791,8 +5893,19 @@ EOF - fi +@@ -4429,7 +4464,7 @@ _LT_EOF ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else -@@ -5856,6 +5969,11 @@ _LT_EOF - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -4861,6 +4896,8 @@ _LT_EOF ;; -+ nto-qnx*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - 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' -@@ -6210,6 +6328,21 @@ _LT_EOF - fi + *nto* | *qnx*) ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$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' -@@ -6435,6 +6568,13 @@ _LT_EOF - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; + openbsd*) +@@ -5318,9 +5355,7 @@ m4_defun([_LT_PROG_CXX], + [ + pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) + 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 ++if test -n "$CXX" && test "X$CXX" != "Xno" ; then + AC_PROG_CXXCPP + else + _lt_caught_CXX_error=yes +@@ -6008,18 +6043,37 @@ if test "$_lt_caught_CXX_error" != yes; -+ nto-qnx*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ _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 -+ ;; -+ - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ # a.out is quite broken and goes directly to ld + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= ++ # Determine if we need to override the c++rt0 that is ++ # picked up by analysing output_verbose_link_cmds ++ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then ++ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" ++ else ++ cpprt0_file= ++ fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then ++ # Workaround some broken pre-1.5 ELF toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ else ++ # Modern ELF works sanely as-is ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ output_verbose_link_cmd='echo' ++ fi + ;; + + *nto* | *qnx*) +- _LT_TAGVAR(ld_shlibs, $1)=yes ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _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 ++ output_verbose_link_cmd='echo' + ;; + + openbsd2*) +@@ -6481,6 +6535,11 @@ $RM -f confest.$objext + # PORTME: override above test on systems where it is broken + m4_if([$1], [CXX], + [case $host_os in ++netbsd*) ++ if test -n "$cpprt0_file"; then ++ _LT_TAGVAR(predep_objects,$1)=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` ++ fi ++ ;; + interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 7cc1c072bc4..4ae661ca038 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.35 2006/01/30 22:19:56 tv Exp $ +$NetBSD: patch-aa,v 1.36 2009/12/15 17:35:37 joerg Exp $ ---- Makefile.in.orig 2005-12-18 17:13:48.000000000 -0500 +--- Makefile.in.orig 2009-09-11 03:13:51.000000000 +0200 +++ Makefile.in -@@ -220,7 +220,7 @@ target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.3e gnu --BUILD_SUBDIRS = . libltdl doc tests -+BUILD_SUBDIRS = . libltdl tests - SUBDIRS = $(BUILD_SUBDIRS) - DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS) - CPPLAGS = @CPPFLAGS@ +@@ -1594,7 +1594,7 @@ all-am: Makefile $(INFO_DEPS) $(LTLIBRAR + config.h all-local + installdirs: installdirs-recursive + installdirs-am: +- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -1658,7 +1658,7 @@ info: info-recursive + info-am: $(INFO_DEPS) + + install-data-am: install-data-local install-includeHEADERS \ +- install-info-am install-ltdlincludeHEADERS ++ install-ltdlincludeHEADERS + + install-dvi: install-dvi-recursive + diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 01fe4737229..12c6e831962 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,77 +1,43 @@ -$NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ +$NetBSD: patch-ab,v 1.64 2009/12/15 17:35:37 joerg Exp $ ---- configure.orig 2008-02-02 05:38:42.000000000 +1300 +--- configure.orig 2009-12-15 16:46:54.000000000 +0100 +++ configure -@@ -630,11 +630,11 @@ else - - 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' && -+ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. -- echo='print -r' -+ 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. -@@ -5260,6 +5260,10 @@ interix[3-9]*) - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; +@@ -5293,6 +5293,13 @@ else + lt_cv_sys_max_cmd_len=8192; + ;; -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; ++ mint*) ++ # On MiNT we can support fairly large cmd lengths, but it takes ++ # a while to run the tests, so let's restrict it to something ++ # reasonable. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -5290,7 +5294,7 @@ newos6*) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. +@@ -5718,7 +5725,7 @@ newos6*) ;; - nto-qnx*) -- lt_cv_deplibs_check_method=unknown + *nto* | *qnx*) +- lt_cv_deplibs_check_method=pass_all + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$' ;; openbsd*) -@@ -6494,12 +6498,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=cpp -+ac_ext=cpp - 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' -@@ -6725,8 +6724,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 -- - - - -@@ -7467,7 +7464,10 @@ for cc_temp in $compiler""; do +@@ -7900,7 +7907,10 @@ for cc_temp in $compiler""; do *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it -@@ -8082,9 +8082,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -8210,9 +8220,11 @@ $as_echo_n "checking for $compiler optio ;; darwin* | rhapsody*) @@ -80,115 +46,53 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + # binaries generally doesn't work # Common symbols not allowed in MH_DYLIB files lt_prog_compiler_pic='-fno-common' -+ lt_prog_compiler_static='' - ;; - - interix[3-9]*) -@@ -8118,6 +8120,11 @@ echo $ECHO_N "checking for $compiler opt - esac ++ ='' ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic='-fPIC' - ;; -@@ -8272,6 +8279,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-Bstatic' + hpux*) +@@ -8234,6 +8246,13 @@ $as_echo_n "checking for $compiler optio + # Instead, we relocate shared libraries at runtime. ;; -+ nto-qnx*) -+ lt_prog_compiler_pic='-fPIC' ++ mint*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ =no ++ enable_shared=no + ;; + - *) - lt_prog_compiler_can_build_shared=no - ;; -@@ -8509,7 +8520,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -8678,8 +8692,19 @@ EOF - fi + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -8431,6 +8450,9 @@ $as_echo_n "checking for $compiler optio + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = ++ ;; + *djgpp*) + lt_prog_compiler_pic= + ;; +@@ -8930,7 +8952,7 @@ _LT_EOF ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else -@@ -8743,6 +8768,11 @@ _LT_EOF - hardcode_shlibpath_var=no - ;; - -+ nto-qnx*) -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -9209,6 +9239,21 @@ if test -z "$aix_libpath"; then aix_libp - fi +@@ -9450,6 +9472,8 @@ rm -f core conftest.err conftest.$ac_obj ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-h,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - 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' -@@ -9434,6 +9479,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var=no + *nto* | *qnx*) ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; -+ nto-qnx*) -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ - *) - ld_shlibs=no - ;; -@@ -9650,6 +9702,7 @@ beos*) + openbsd*) +@@ -10064,6 +10088,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -196,7 +100,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd 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' -@@ -9748,9 +9801,7 @@ freebsd1*) +@@ -10165,9 +10190,7 @@ freebsd1*) dynamic_linker=no ;; @@ -207,7 +111,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -9762,7 +9813,7 @@ freebsd* | dragonfly*) +@@ -10179,7 +10202,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -216,7 +120,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ need_version=no need_lib_prefix=no ;; -@@ -9785,13 +9836,24 @@ freebsd* | dragonfly*) +@@ -10202,13 +10225,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -242,22 +146,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ gnu*) version_type=linux need_lib_prefix=no -@@ -9860,15 +9922,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -10280,12 +10314,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -271,7 +160,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ esac need_lib_prefix=no need_version=no -@@ -9933,11 +10002,11 @@ linux* | k*bsd*-gnu) +@@ -10376,15 +10405,14 @@ rm -f core conftest.err conftest.$ac_obj ;; netbsd*) @@ -279,20 +168,17 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -9962,13 +10031,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -10413,7 +10441,7 @@ newsos6) ;; openbsd*) @@ -301,122 +187,93 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -9976,7 +10046,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -10421,7 +10449,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -11566,9 +11636,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=cpp + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -12587,9 +12615,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 ++if test -n "$CXX" && test "X$CXX" != "Xno" ; then + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -11674,7 +11742,10 @@ for cc_temp in $compiler""; do +@@ -12836,7 +12862,10 @@ $RM -r conftest* *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + + if test -n "$compiler"; then +@@ -13628,18 +13657,37 @@ if test -z "$aix_libpath"; then aix_libp + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ # a.out is quite broken and goes directly to ld + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= ++ # Determine if we need to override the c++rt0 that is ++ # picked up by analysing output_verbose_link_cmds ++ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then ++ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" ++ else ++ cpprt0_file= ++ fi + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no +- fi +- # Workaround some broken pre-1.5 toolchains +- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then ++ # Workaround some broken pre-1.5 ELF toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ else ++ # Modern ELF works sanely as-is ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ output_verbose_link_cmd='echo' ++ fi + ;; + *nto* | *qnx*) +- ld_shlibs_CXX=yes ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ='-R$libdir' ++ =yes ++ =no ++ output_verbose_link_cmd='echo' + ;; - # We don't want -fno-exception wen compiling C++ code, so set the -@@ -12309,6 +12380,16 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='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' - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -12462,14 +12543,29 @@ if test -z "$aix_libpath"; then aix_libp - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ # a.out is quite broken and goes directly to ld - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -+ # Determine if we need to override the c++rt0 that is -+ # picked up by analysing output_verbose_link_cmds -+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then -+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" -+ else -+ cpprt0_file= -+ fi - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then -+ # Workaround some broken pre-1.5 ELF toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ else -+ # Modern ELF works sanely as-is -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' - fi -- # Workaround some broken pre-1.5 toolchains -- 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 -@@ -12782,6 +12878,11 @@ if test -z "$aix_libpath"; then aix_libp - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -+ nto-qnx*) -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' -+ ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -12891,6 +12992,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - esac - done - -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac -+ - # Clean up. - rm -f a.out a.exe - else -@@ -13000,9 +13116,11 @@ echo $ECHO_N "checking for $compiler opt + openbsd2*) +@@ -14036,6 +14084,11 @@ $RM -f confest.$objext + + # PORTME: override above test on systems where it is broken + case $host_os in ++netbsd*) ++ if test -n "$cpprt0_file"; then ++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` ++ fi ++ ;; + interix[3-9]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. +@@ -14176,9 +14229,15 @@ $as_echo_n "checking for $compiler optio lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -425,40 +282,35 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + # binaries generally doesn't work # Common symbols not allowed in MH_DYLIB files lt_prog_compiler_pic_CXX='-fno-common' -+ lt_prog_compiler_static_CXX='' ++ ='' ++ ;; ++ *mint*) ++ # FreeMiNT does not support shared libraries at all ++ = ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -13028,6 +13146,10 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; -@@ -13106,6 +13228,8 @@ echo $ECHO_N "checking for $compiler opt - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? +@@ -14246,6 +14305,9 @@ $as_echo_n "checking for $compiler optio + ;; + esac ;; -+ interix3*) ++ mint*) ++ # FreeMiNT uses GNU C++ + ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -13245,6 +13369,8 @@ echo $ECHO_N "checking for $compiler opt + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ ;; - vxworks*) - ;; -+ nto-qnx*) -+ ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; -@@ -13618,6 +13744,7 @@ beos*) +@@ -14443,6 +14505,9 @@ $as_echo_n "checking for $compiler optio + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = ++ ;; + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; +@@ -14948,6 +15013,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -466,7 +318,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd 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' -@@ -13715,9 +13842,7 @@ freebsd1*) +@@ -15048,9 +15114,7 @@ freebsd1*) dynamic_linker=no ;; @@ -477,7 +329,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -13729,7 +13854,7 @@ freebsd* | dragonfly*) +@@ -15062,7 +15126,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -486,7 +338,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ need_version=no need_lib_prefix=no ;; -@@ -13752,13 +13877,24 @@ freebsd* | dragonfly*) +@@ -15085,13 +15149,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -512,22 +364,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ gnu*) version_type=linux need_lib_prefix=no -@@ -13827,15 +13963,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -15163,12 +15238,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -541,7 +378,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ esac need_lib_prefix=no need_version=no -@@ -13900,11 +14043,11 @@ linux* | k*bsd*-gnu) +@@ -15259,15 +15329,14 @@ rm -f core conftest.err conftest.$ac_obj ;; netbsd*) @@ -549,20 +386,17 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -13929,13 +14072,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -15296,7 +15365,7 @@ newsos6) ;; openbsd*) @@ -571,28 +405,28 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -13943,7 +14087,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -15304,7 +15373,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -14661,7 +14805,10 @@ for cc_temp in $compiler""; do + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -15877,7 +15946,10 @@ $RM -r conftest* *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -@@ -14742,9 +14889,11 @@ echo $ECHO_N "checking for $compiler opt + GCC=$G77 + if test -n "$compiler"; then +@@ -15971,9 +16043,11 @@ $as_echo_n "checking for $compiler optio ;; darwin* | rhapsody*) @@ -601,115 +435,53 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + # 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='' - ;; - - interix[3-9]*) -@@ -14778,6 +14927,11 @@ echo $ECHO_N "checking for $compiler opt - esac ++ ='' ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; -@@ -14932,6 +15086,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-Bstatic' + hpux*) +@@ -15995,6 +16069,13 @@ $as_echo_n "checking for $compiler optio + # Instead, we relocate shared libraries at runtime. ;; -+ nto-qnx*) -+ lt_prog_compiler_pic_F77='-fPIC' ++ mint*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ =no ++ enable_shared=no + ;; + - *) - lt_prog_compiler_can_build_shared_F77=no - ;; -@@ -15169,7 +15327,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -15338,8 +15499,19 @@ EOF - fi + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -16192,6 +16273,9 @@ $as_echo_n "checking for $compiler optio + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = ++ ;; + *djgpp*) + lt_prog_compiler_pic_F77= + ;; +@@ -16676,7 +16760,7 @@ _LT_EOF ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else -@@ -15403,6 +15575,11 @@ _LT_EOF - hardcode_shlibpath_var_F77=no +@@ -17183,6 +17267,8 @@ rm -f core conftest.err conftest.$ac_obj ;; -+ nto-qnx*) -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -15849,6 +16026,21 @@ if test -z "$aix_libpath"; then aix_libp - fi + *nto* | *qnx*) ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-h,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - 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' -@@ -16074,6 +16266,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var_F77=no - ;; - -+ nto-qnx*) -+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - *) - ld_shlibs_F77=no - ;; -@@ -16239,6 +16438,7 @@ beos*) + openbsd*) +@@ -17644,6 +17730,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -717,7 +489,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd 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' -@@ -16336,9 +16536,7 @@ freebsd1*) +@@ -17744,9 +17831,7 @@ freebsd1*) dynamic_linker=no ;; @@ -728,7 +500,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -16350,7 +16548,7 @@ freebsd* | dragonfly*) +@@ -17758,7 +17843,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -737,7 +509,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ need_version=no need_lib_prefix=no ;; -@@ -16373,13 +16571,24 @@ freebsd* | dragonfly*) +@@ -17781,13 +17866,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -763,22 +535,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ gnu*) version_type=linux need_lib_prefix=no -@@ -16448,15 +16657,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -17859,12 +17955,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -792,7 +549,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ esac need_lib_prefix=no need_version=no -@@ -16521,11 +16737,11 @@ linux* | k*bsd*-gnu) +@@ -17949,15 +18040,14 @@ rm -f core conftest.err conftest.$ac_obj ;; netbsd*) @@ -800,20 +557,17 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -16550,13 +16766,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -17986,7 +18076,7 @@ newsos6) ;; openbsd*) @@ -822,28 +576,28 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -16564,7 +16781,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -17994,7 +18084,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -17242,7 +17459,10 @@ for cc_temp in $compiler""; do + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -18557,7 +18647,10 @@ $RM -r conftest* *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - # GCJ did not exist at the time GCC didn't implicitly link libc in. -@@ -17347,9 +17567,11 @@ echo $ECHO_N "checking for $compiler opt + if test -n "$compiler"; then +@@ -18776,9 +18869,11 @@ $as_echo_n "checking for $compiler optio ;; darwin* | rhapsody*) @@ -851,116 +605,54 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + # 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_GCJ='-fno-common' -+ lt_prog_compiler_static_GCJ='' - ;; - - interix[3-9]*) -@@ -17383,6 +17605,11 @@ echo $ECHO_N "checking for $compiler opt - esac + lt_prog_compiler_pic_FC='-fno-common' ++ ='' ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; -@@ -17537,6 +17764,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-Bstatic' + hpux*) +@@ -18800,6 +18895,13 @@ $as_echo_n "checking for $compiler optio + # Instead, we relocate shared libraries at runtime. ;; -+ nto-qnx*) -+ lt_prog_compiler_pic_GCJ='-fPIC' ++ mint*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ =no ++ enable_shared=no + ;; + - *) - lt_prog_compiler_can_build_shared_GCJ=no - ;; -@@ -17774,7 +18005,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -17943,8 +18177,19 @@ EOF - fi + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -18997,6 +19099,9 @@ $as_echo_n "checking for $compiler optio + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = ++ ;; + *djgpp*) + lt_prog_compiler_pic_FC= + ;; +@@ -19481,7 +19586,7 @@ _LT_EOF ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else -@@ -18008,6 +18253,11 @@ _LT_EOF - hardcode_shlibpath_var_GCJ=no +@@ -19988,6 +20093,8 @@ rm -f core conftest.err conftest.$ac_obj ;; -+ nto-qnx*) -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -18474,6 +18724,21 @@ if test -z "$aix_libpath"; then aix_libp - fi + *nto* | *qnx*) ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - 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' -@@ -18699,6 +18964,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var_GCJ=no - ;; - -+ nto-qnx*) -+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - *) - ld_shlibs_GCJ=no - ;; -@@ -18864,6 +19136,7 @@ beos*) + openbsd*) +@@ -20449,6 +20556,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -968,7 +660,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd 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' -@@ -18961,9 +19234,7 @@ freebsd1*) +@@ -20549,9 +20657,7 @@ freebsd1*) dynamic_linker=no ;; @@ -979,7 +671,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -18975,7 +19246,7 @@ freebsd* | dragonfly*) +@@ -20563,7 +20669,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -988,7 +680,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ need_version=no need_lib_prefix=no ;; -@@ -18998,13 +19269,24 @@ freebsd* | dragonfly*) +@@ -20586,13 +20692,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -1014,22 +706,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ gnu*) version_type=linux need_lib_prefix=no -@@ -19073,15 +19355,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -20664,12 +20781,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1043,7 +720,7 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ esac need_lib_prefix=no need_version=no -@@ -19146,11 +19435,11 @@ linux* | k*bsd*-gnu) +@@ -20754,15 +20866,14 @@ rm -f core conftest.err conftest.$ac_obj ;; netbsd*) @@ -1051,20 +728,17 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -19175,13 +19464,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -20791,7 +20902,7 @@ newsos6) ;; openbsd*) @@ -1073,33 +747,91 @@ $NetBSD: patch-ab,v 1.63 2009/07/08 21:01:43 markd Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -19189,7 +19479,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -20799,7 +20910,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -19866,7 +20156,10 @@ for cc_temp in $compiler""; do + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -21205,7 +21316,10 @@ for cc_temp in $compiler""; do + *) 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 ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + + # GCJ did not exist at the time GCC didn't implicitly link libc in. +@@ -21320,9 +21434,11 @@ $as_echo_n "checking for $compiler optio + ;; + + 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_GCJ='-fno-common' ++ ='' + ;; + + hpux*) +@@ -21344,6 +21460,13 @@ $as_echo_n "checking for $compiler optio + # Instead, we relocate shared libraries at runtime. + ;; + ++ mint*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ =no ++ enable_shared=no ++ ;; ++ + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -21541,6 +21664,9 @@ $as_echo_n "checking for $compiler optio + + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = ++ ;; + *djgpp*) + lt_prog_compiler_pic_GCJ= + ;; +@@ -22025,7 +22151,7 @@ _LT_EOF + ;; + + netbsd*) +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +@@ -22545,6 +22671,8 @@ rm -f core conftest.err conftest.$ac_obj + ;; + + *nto* | *qnx*) ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + + openbsd*) +@@ -23115,7 +23243,10 @@ for cc_temp in $compiler""; do *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` lt_cv_prog_compiler_c_o_RC=yes -@@ -21547,7 +21840,7 @@ echo "$as_me: executing $ac_file command - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 02da95e2a0b..809d598eada 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,174 +1,17 @@ -$NetBSD: patch-ac,v 1.23 2007/09/15 12:11:45 joerg Exp $ +$NetBSD: patch-ac,v 1.24 2009/12/15 17:35:37 joerg Exp $ ---- ltmain.sh.orig 2007-06-24 04:22:04.000000000 +0200 -+++ ltmain.sh -@@ -244,6 +244,31 @@ func_win32_libid () - # arg is usually of the form 'gcc ...' - func_infer_tag () - { -+ # Set the commonly-used compilers for some tags. -+ tag_compilers_CC="*cc *xlc" -+ tag_compilers_CXX="*++ *CC" -+ tag_compilers_F77="*77 *fort" -+ base_compiler=`set -- "$@"; $echo $1` -+ # If $tagname still isn't set, then try to infer if the default -+ # "CC" tag applies by matching up the base compile command to some -+ # compilers commonly used for the "CC" tag. -+ if test -z "$tagname"; then -+ z=CC -+ eval "tag_compilers=\$tag_compilers_${z}" -+ if test -n "$tag_compilers"; then -+ for zp in $tag_compilers; do -+ case $base_compiler in -+ $zp) -+ # The compiler in the base compile command matches -+ # one of the common compilers for the current tag. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ done -+ fi -+ fi - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -@@ -284,6 +309,27 @@ func_infer_tag () - break - ;; - esac -+ # If $tagname still isn't set, then try to infer it by -+ # matching up the base compile command to some compilers -+ # commonly used for certain tags. -+ base_compiler=`set -- "$@"; $echo $1` -+ eval "tag_compilers=\$tag_compilers_${z}" -+ if test -n "$tag_compilers"; then -+ for zp in $tag_compilers; do -+ case $base_compiler in -+ $zp) -+ # The compiler in the base compile command matches -+ # one of the common compilers for the current tag. -+ # Assume this is the tagged configuration we want. -+ tagname=$z -+ break -+ ;; -+ esac -+ done -+ if test -n "$tagname"; then -+ break -+ fi -+ fi - fi - done - # If $tagname still isn't set, then no tagged configuration -@@ -597,7 +643,7 @@ if test -z "$show_help"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in -- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) -+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC) - mode=link - for arg - do -@@ -1414,6 +1460,13 @@ EOF - exit $EXIT_FAILURE - ;; - esac -+ # Canonicalise the pathname -+ tmp="" -+ while test "$arg" != "$tmp" -+ do -+ tmp=$arg -+ arg=`$echo "X$arg" | $Xsed -e 's%[^/.][^/.]*/\.\.%%g' -e 's%/\./%/%g' -e 's%//*%/%g' -e 's%/$%%g'` -+ done - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -@@ -1643,6 +1696,12 @@ EOF - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -+ case $host:$arg in -+ *-*-dragonfly*:-pthread) -+ # pkgsrc hack to use -pthread in .la file for final linking -+ deplibs="$deplibs $arg" -+ ;; -+ esac - continue - ;; +--- libltdl/config/ltmain.sh.orig 2009-11-16 14:23:18.000000000 +0100 ++++ libltdl/config/ltmain.sh +@@ -111,9 +111,9 @@ done + $lt_unset CDPATH -@@ -2141,6 +2200,30 @@ EOF - else - compiler_flags="$compiler_flags $deplib" - fi -+ case $host:$deplib in -+ *-*-dragonfly*:-pthread) -+ # pkgsrc hack to use -pthread in .la file for final linking -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ ;; -+ esac -+ ;; -+ esac - continue - ;; - -l*) -@@ -3290,6 +3373,7 @@ EOF - # Calculate the version variables. - major= - versuffix= -+ versuffix2= - verstring= - case $version_type in - none) ;; -@@ -3343,6 +3427,7 @@ EOF - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" -+ versuffix2="$major.$age" - ;; - osf) -@@ -3405,6 +3490,7 @@ EOF - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= -+ versuffix2= - verstring="" - fi - -@@ -5883,8 +5969,16 @@ relink_command=\"$relink_command\"" - exit $EXIT_FAILURE - fi - -- # Strip any trailing slash from the destination. -- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` -+ # Canonicalise the pathname: -+ # - remove foo/../ -+ # - replace // -+ # - remove /./ -+ # - strip any trailing / -+ tmp="" -+ while test "$dest" != "$tmp"; do -+ tmp=$dest -+ dest=`$echo "X$dest" | $Xsed -e 's%[^/.][^/.]*/\.\.%%g' -e 's%/\./%/%g' -e 's%//*%/%g' -e 's%/$%%g'` -+ done - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes +- +- +- ++unset CP ++unset MV ++unset RM + : ${CP="cp -f"} + : ${ECHO="echo"} + : ${EGREP="/bin/grep -E"} diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index 541512690b4..d8c4dc455d9 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,77 +1,43 @@ -$NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ +$NetBSD: patch-ad,v 1.35 2009/12/15 17:35:37 joerg Exp $ ---- libltdl/configure.orig 2008-02-01 17:38:49.000000000 +0100 +--- libltdl/configure.orig 2009-12-15 16:46:54.000000000 +0100 +++ libltdl/configure -@@ -630,11 +630,11 @@ else - - 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' && -+ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. -- echo='print -r' -+ 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. -@@ -4395,6 +4395,10 @@ interix[3-9]*) - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; +@@ -4542,6 +4542,13 @@ else + lt_cv_sys_max_cmd_len=8192; + ;; -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; ++ mint*) ++ # On MiNT we can support fairly large cmd lengths, but it takes ++ # a while to run the tests, so let's restrict it to something ++ # reasonable. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; + - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -4425,7 +4429,7 @@ newos6*) + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. +@@ -4967,7 +4974,7 @@ newos6*) ;; - nto-qnx*) -- lt_cv_deplibs_check_method=unknown + *nto* | *qnx*) +- lt_cv_deplibs_check_method=pass_all + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$' ;; openbsd*) -@@ -6101,12 +6105,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=cpp -+ac_ext=cpp - 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' -@@ -6332,8 +6331,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' -@@ -7334,7 +7331,10 @@ for cc_temp in $compiler""; do +@@ -7286,7 +7293,10 @@ for cc_temp in $compiler""; do *) break;; esac done --cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +-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-%%"` ++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi ++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it -@@ -7949,9 +7949,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -7596,9 +7606,11 @@ $as_echo_n "checking for $compiler optio ;; darwin* | rhapsody*) @@ -80,630 +46,53 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ + # binaries generally doesn't work # Common symbols not allowed in MH_DYLIB files lt_prog_compiler_pic='-fno-common' -+ lt_prog_compiler_static='' - ;; - - interix[3-9]*) -@@ -7985,6 +7987,11 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic='-fPIC' ++ ='' ;; -@@ -8139,6 +8146,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static='-Bstatic' - ;; - -+ nto-qnx*) -+ lt_prog_compiler_pic='-fPIC' -+ ;; -+ - *) - lt_prog_compiler_can_build_shared=no - ;; -@@ -8376,7 +8387,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - case $host_os in - cygwin* | mingw* | pw32*) -@@ -8545,6 +8559,17 @@ EOF - fi + hpux*) +@@ -7620,6 +7632,13 @@ $as_echo_n "checking for $compiler optio + # Instead, we relocate shared libraries at runtime. ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' ++ mint*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ =no ++ enable_shared=no + ;; + - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -8610,6 +8635,11 @@ _LT_EOF - hardcode_shlibpath_var=no - ;; - -+ nto-qnx*) -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -9076,6 +9106,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-h,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - 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' -@@ -9301,6 +9346,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var=no - ;; - -+ nto-qnx*) -+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ ;; -+ - *) - ld_shlibs=no - ;; -@@ -9517,6 +9569,7 @@ beos*) - bsdi[45]*) - 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' -@@ -9615,9 +9668,7 @@ freebsd1*) - dynamic_linker=no - ;; - --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -+freebsd*) - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else -@@ -9629,7 +9680,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - need_version=no - need_lib_prefix=no - ;; -@@ -9652,13 +9703,24 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- *) # from 4.6 on, and DragonFly -+ *) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -+dragonfly*) -+ 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' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ - gnu*) - version_type=linux - need_lib_prefix=no -@@ -9727,15 +9789,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -+ *) version_type=irix ;; - esac - need_lib_prefix=no - need_version=no -@@ -9800,11 +9869,11 @@ linux* | k*bsd*-gnu) - ;; - - netbsd*) -- version_type=sunos -+ version_type=linux - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- 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' - dynamic_linker='NetBSD (a.out) ld.so' - else -@@ -9829,13 +9898,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - - 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. -@@ -9843,7 +9913,7 @@ openbsd*) - 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}${release}${shared_ext}$major ${libname}${shared_ext}' - 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 -@@ -11433,9 +11503,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=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -11541,7 +11609,10 @@ for cc_temp in $compiler""; do - *) 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-%%"` - + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. +@@ -7817,6 +7836,9 @@ $as_echo_n "checking for $compiler optio - # We don't want -fno-exception wen compiling C++ code, so set the -@@ -12176,6 +12247,16 @@ if test -z "$aix_libpath"; then aix_libp - archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='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' - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' + case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: ++ mint*) ++ = + ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -12329,14 +12410,29 @@ if test -z "$aix_libpath"; then aix_libp - ;; - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -+ # a.out is quite broken and goes directly to ld - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -+ # Determine if we need to override the c++rt0 that is -+ # picked up by analysing output_verbose_link_cmds -+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then -+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC" -+ else -+ cpprt0_file= -+ fi - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then -+ # Workaround some broken pre-1.5 ELF toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ else -+ # Modern ELF works sanely as-is -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' - fi -- # Workaround some broken pre-1.5 toolchains -- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + *djgpp*) + lt_prog_compiler_pic= ;; - openbsd2*) - # C++ shared libraries are fairly broken -@@ -12649,6 +12745,11 @@ if test -z "$aix_libpath"; then aix_libp - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -+ nto-qnx*) -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ output_verbose_link_cmd='echo' -+ ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -12758,6 +12859,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - esac - done - -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac -+ - # Clean up. - rm -f a.out a.exe - else -@@ -12867,9 +12983,11 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - 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_CXX='-fno-common' -+ lt_prog_compiler_static_CXX='' +@@ -8316,7 +8338,7 @@ _LT_EOF ;; - *djgpp*) - # DJGPP does not support shared libraries at all -@@ -12895,6 +13013,10 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; -@@ -12973,6 +13095,8 @@ echo $ECHO_N "checking for $compiler opt - # This is c89, which is MS Visual C++ (no shared libs) - # Anyone wants to do a port? - ;; -+ interix3*) -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -13112,6 +13236,8 @@ echo $ECHO_N "checking for $compiler opt - ;; - vxworks*) - ;; -+ nto-qnx*) -+ ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; -@@ -13485,6 +13611,7 @@ beos*) - bsdi[45]*) - 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' -@@ -13582,9 +13709,7 @@ freebsd1*) - dynamic_linker=no - ;; --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -+freebsd*) - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else -@@ -13596,7 +13721,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - need_version=no - need_lib_prefix=no - ;; -@@ -13619,13 +13744,24 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- *) # from 4.6 on, and DragonFly -+ *) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -+dragonfly*) -+ 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' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ - gnu*) - version_type=linux - need_lib_prefix=no -@@ -13694,15 +13830,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -+ *) version_type=irix ;; - esac - need_lib_prefix=no - need_version=no -@@ -13767,11 +13910,11 @@ linux* | k*bsd*-gnu) - ;; - - netbsd*) -- version_type=sunos -+ version_type=linux - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- 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' - dynamic_linker='NetBSD (a.out) ld.so' - else -@@ -13796,13 +13939,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - - 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. -@@ -13810,7 +13954,7 @@ openbsd*) - 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}${release}${shared_ext}$major ${libname}${shared_ext}' - 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 -@@ -14528,7 +14672,10 @@ for cc_temp in $compiler""; do - *) 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-%%"` - - - { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -@@ -14609,9 +14756,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='' - ;; - - interix[3-9]*) -@@ -14645,6 +14794,11 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; -@@ -14799,6 +14953,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_F77='-Bstatic' - ;; - -+ nto-qnx*) -+ lt_prog_compiler_pic_F77='-fPIC' -+ ;; -+ - *) - lt_prog_compiler_can_build_shared_F77=no - ;; -@@ -15036,7 +15194,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -15205,6 +15366,17 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -15270,6 +15442,11 @@ _LT_EOF - hardcode_shlibpath_var_F77=no - ;; - -+ nto-qnx*) -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -15716,6 +15893,21 @@ if test -z "$aix_libpath"; then aix_libp - fi +- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +@@ -8836,6 +8858,8 @@ rm -f core conftest.err conftest.$ac_obj ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-h,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - 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' -@@ -15941,6 +16133,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var_F77=no + *nto* | *qnx*) ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; -+ nto-qnx*) -+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - *) - ld_shlibs_F77=no - ;; -@@ -16106,6 +16305,7 @@ beos*) + openbsd*) +@@ -9450,6 +9474,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -711,7 +100,7 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg 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' -@@ -16203,9 +16403,7 @@ freebsd1*) +@@ -9551,9 +9576,7 @@ freebsd1*) dynamic_linker=no ;; @@ -722,7 +111,7 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ if test -x /usr/bin/objformat; then objformat=`/usr/bin/objformat` else -@@ -16217,7 +16415,7 @@ freebsd* | dragonfly*) +@@ -9565,7 +9588,7 @@ freebsd* | dragonfly*) version_type=freebsd-$objformat case $version_type in freebsd-elf*) @@ -731,7 +120,7 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ need_version=no need_lib_prefix=no ;; -@@ -16240,13 +16438,24 @@ freebsd* | dragonfly*) +@@ -9588,13 +9611,24 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; @@ -757,22 +146,7 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ gnu*) version_type=linux need_lib_prefix=no -@@ -16315,15 +16524,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ +@@ -9666,12 +9700,7 @@ interix[3-9]*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -786,7 +160,7 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ esac need_lib_prefix=no need_version=no -@@ -16388,11 +16604,11 @@ linux* | k*bsd*-gnu) +@@ -9762,15 +9791,14 @@ rm -f core conftest.err conftest.$ac_obj ;; netbsd*) @@ -794,268 +168,17 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ + version_type=linux need_lib_prefix=no need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- 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' - dynamic_linker='NetBSD (a.out) ld.so' - else -@@ -16417,13 +16633,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; - - 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. -@@ -16431,7 +16648,7 @@ openbsd*) - 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}${release}${shared_ext}$major ${libname}${shared_ext}' - 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 -@@ -17109,7 +17326,10 @@ for cc_temp in $compiler""; do - *) 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-%%"` - - - # GCJ did not exist at the time GCC didn't implicitly link libc in. -@@ -17214,9 +17434,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_GCJ='-fno-common' -+ lt_prog_compiler_static_GCJ='' - ;; - - interix[3-9]*) -@@ -17250,6 +17472,11 @@ echo $ECHO_N "checking for $compiler opt - esac - ;; - -+ interix3*) -+ # Interix 3.0-3.5 -fPIC option generates borked code. -+ # (Instead, shlibs are relocated at runtime.) -+ ;; -+ - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; -@@ -17404,6 +17631,10 @@ echo $ECHO_N "checking for $compiler opt - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -+ nto-qnx*) -+ lt_prog_compiler_pic_GCJ='-fPIC' -+ ;; -+ - *) - lt_prog_compiler_can_build_shared_GCJ=no - ;; -@@ -17641,7 +17872,10 @@ echo $ECHO_N "checking whether the $comp - *) 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-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -17810,6 +18044,17 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -17875,6 +18120,11 @@ _LT_EOF - hardcode_shlibpath_var_GCJ=no - ;; - -+ nto-qnx*) -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -@@ -18341,6 +18591,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - 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' -@@ -18566,6 +18831,13 @@ if test -z "$aix_libpath"; then aix_libp - hardcode_shlibpath_var_GCJ=no - ;; - -+ nto-qnx*) -+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - *) - ld_shlibs_GCJ=no - ;; -@@ -18731,6 +19003,7 @@ beos*) - bsdi[45]*) - 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' -@@ -18828,9 +19101,7 @@ freebsd1*) - dynamic_linker=no - ;; - --freebsd* | dragonfly*) -- # DragonFly does not have aout. When/if they implement a new -- # versioning mechanism, adjust this. -+freebsd*) - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` - else -@@ -18842,7 +19113,7 @@ freebsd* | dragonfly*) - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - need_version=no - need_lib_prefix=no - ;; -@@ -18865,13 +19136,24 @@ freebsd* | dragonfly*) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; -- *) # from 4.6 on, and DragonFly -+ *) # from 4.6 on - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; - -+dragonfly*) -+ 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' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ - gnu*) - version_type=linux - need_lib_prefix=no -@@ -18940,15 +19222,22 @@ interix[3-9]*) - hardcode_into_libs=yes - ;; - -+interix3*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; -- *) -- if test "$lt_cv_prog_gnu_ld" = yes; then -- version_type=linux -- else -- version_type=irix -- fi ;; -+ *) version_type=irix ;; - esac - need_lib_prefix=no - need_version=no -@@ -19013,11 +19302,11 @@ linux* | k*bsd*-gnu) - ;; - - netbsd*) -- version_type=sunos -+ version_type=linux - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - 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' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -19042,13 +19331,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}' -+ dynamic_linker='QNX libc.so' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi +@@ -9799,7 +9827,7 @@ newsos6) ;; openbsd*) @@ -1064,84 +187,12 @@ $NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $ sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -@@ -19056,7 +19346,7 @@ openbsd*) - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; +@@ -9807,7 +9835,7 @@ openbsd*) + 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}${release}${shared_ext}$major ${libname}${shared_ext}' 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 -@@ -19733,7 +20023,10 @@ for cc_temp in $compiler""; do - *) 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_cv_prog_compiler_c_o_RC=yes - -@@ -21414,7 +21707,7 @@ else - # we want this `case' here to explicitly catch those versions. - libltdl_cv_sys_dlopen_deplibs=unknown - ;; -- aix[4-9]*) -+ aix[45]*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; - darwin*) -@@ -21422,10 +21715,7 @@ else - # If you are looking for one http://www.opendarwin.org/projects/dlcompat - libltdl_cv_sys_dlopen_deplibs=yes - ;; -- freebsd* | dragonfly*) -- libltdl_cv_sys_dlopen_deplibs=yes -- ;; -- gnu* | linux* | k*bsd*-gnu) -+ gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) - # GNU and its variants, using gnu ld.so (Glibc) - libltdl_cv_sys_dlopen_deplibs=yes - ;; -@@ -23981,22 +24271,21 @@ echo "$as_me: $ac_file is unchanged" >&6 - fi - rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. --_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $_am_arg | $_am_arg:* ) -+ $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || --$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$_am_arg" : 'X\(//\)[^/]' \| \ -- X"$_am_arg" : 'X\(//\)$' \| \ -- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || --echo X"$_am_arg" | -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X$ac_file : 'X\(//\)[^/]' \| \ -+ X$ac_file : 'X\(//\)$' \| \ -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || -+echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -24033,7 +24322,7 @@ echo "$as_me: executing $ac_file command - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then -+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae deleted file mode 100644 index c165320140b..00000000000 --- a/devel/libtool/patches/patch-ae +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-ae,v 1.8 2009/12/15 17:07:43 joerg Exp $ -backport of libltdl 2.26b security fixes from gnu git repo - ---- libltdl/ltdl.c.orig 2009-11-30 18:14:58.302462100 -0600 -+++ libltdl/ltdl.c 2009-11-30 18:17:57.759481200 -0600 -@@ -2192,7 +2192,8 @@ - static int try_dlopen LT_PARAMS((lt_dlhandle *handle, - const char *filename)); - static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle, -- const char *filename)); -+ const char *filename, -+ const char * useloader)); - static int unload_deplibs LT_PARAMS((lt_dlhandle handle)); - static int lt_argz_insert LT_PARAMS((char **pargz, - size_t *pargz_len, -@@ -2390,9 +2391,10 @@ - } - - static int --tryall_dlopen (handle, filename) -+tryall_dlopen (handle, filename, useloader) - lt_dlhandle *handle; - const char *filename; -+ const char *useloader; - { - lt_dlhandle cur; - lt_dlloader *loader; -@@ -2459,6 +2461,11 @@ - - while (loader) - { -+ if (useloader && strcmp(loader->loader_name, useloader)) -+ { -+ loader = loader->next; -+ continue; -+ } - lt_user_data data = loader->dlloader_data; - - cur->module = loader->module_open (data, filename); -@@ -2528,7 +2535,7 @@ - error += tryall_dlopen_module (handle, - (const char *) 0, prefix, filename); - } -- else if (tryall_dlopen (handle, filename) != 0) -+ else if (tryall_dlopen (handle, filename, NULL) != 0) - { - ++error; - } -@@ -2549,7 +2556,7 @@ - /* Try to open the old library first; if it was dlpreopened, - we want the preopened version of it, even if a dlopenable - module is available. */ -- if (old_name && tryall_dlopen (handle, old_name) == 0) -+ if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0) - { - return 0; - } -@@ -2813,7 +2820,7 @@ - - /* Try to dlopen the file, but do not continue searching in any - case. */ -- if (tryall_dlopen (handle, filename) != 0) -+ if (tryall_dlopen (handle, filename,NULL) != 0) - *handle = 0; - - return 1; -@@ -3103,7 +3110,7 @@ - /* lt_dlclose()ing yourself is very bad! Disallow it. */ - LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG); - -- if (tryall_dlopen (&newhandle, 0) != 0) -+ if (tryall_dlopen (&newhandle, 0, NULL) != 0) - { - LT_DLFREE (*phandle); - return 1; -@@ -3225,7 +3232,7 @@ - } - #endif - } -- if (!file) -+ else - { - file = fopen (filename, LT_READTEXT_MODE); - } -@@ -3412,7 +3419,7 @@ - #endif - ))) - { -- if (tryall_dlopen (&newhandle, filename) != 0) -+ if (tryall_dlopen (&newhandle, filename, NULL) != 0) - { - newhandle = NULL; - } diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk index 70cc214f717..d288ba6eadb 100644 --- a/mk/compiler/f2c.mk +++ b/mk/compiler/f2c.mk @@ -1,4 +1,4 @@ -# $NetBSD: f2c.mk,v 1.12 2009/12/03 12:44:10 asau Exp $ +# $NetBSD: f2c.mk,v 1.13 2009/12/15 17:35:36 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,16 +40,6 @@ COMPILER_F2C_MK= defined .include "../../mk/bsd.prefs.mk" -.if !empty(PKGPATH:Mlang/f2c) || !empty(PKGPATH:Mdevel/patch) || \ - !empty(PKGPATH:Mdevel/libtool-base) -IGNORE_F2C= yes -MAKEFLAGS+= IGNORE_F2C=yes -.endif - -.if defined(IGNORE_F2C) -_USE_F2C= NO -.endif - # LANGUAGES.<compiler> is the list of supported languages by the compiler. # _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the ones # requested by the package in USE_LANGUAGES. @@ -99,12 +89,31 @@ PREPEND_PATH+= ${_F2C_DIR}/bin # Dependencies: BUILD_DEPENDS+= f2c>20090411:../../lang/f2c # translator + +.if empty(PKGPATH:Mdevel/libtool-base) # See below . include "../../devel/libf2c/buildlink3.mk" # library +.endif . if defined(F2C_DIR) && !empty(F2C_DIR) PKGSRC_MAKE_ENV+= F2C_DIR=${F2C_DIR:Q} . endif +# libtool-base is special as it only needs f77 to extract linker flags etc. +.if !empty(PKGPATH:Mdevel/libtool-base) +pre-configure: fake-f2c-libs + +_WRAP_EXTRA_ARGS.FC+= -L${WRKDIR}/.f2c/lib -I${WRKDIR}/.f2c/include + +fake-f2c-libs: + ${MKDIR} ${WRKDIR}/.f2c/include + ${MKDIR} ${WRKDIR}/.f2c/lib + ${ECHO} 'int main(void) { return 0; }' > ${WRKDIR}/.f2c/lib/main.c + ${CC} -c -o ${WRKDIR}/.f2c/lib/main.o ${WRKDIR}/.f2c/lib/main.c + ${AR} cq ${WRKDIR}/.f2c/lib/libf2c.a ${WRKDIR}/.f2c/lib/main.o + ${RANLIB} ${WRKDIR}/.f2c/lib/libf2c.a + ${TOUCH} ${WRKDIR}/.f2c/include/f2c.h +.endif + # Create symlinks for the compiler into ${WRKDIR}. . for _var_ in ${_F2C_VARS} . if !target(${_F2C_${_var_}}) |