Date: Wed, 16 Oct 2002 22:17:27 +0200 (CEST) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/44151: Update libtool to 1.4.3 Message-ID: <200210162017.g9GKHRcN002270@coyote.dnsalias.net>
next in thread | raw e-mail | index | archive | help
>Number: 44151
>Category: ports
>Synopsis: Update libtool to 1.4.3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 16 13:20:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD coyote.dnsalias.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 14 19:16:20 CEST 2002 root@coyote.dnsalias.net:/usr/obj/usr/src/sys/COYOTE i386
>Description:
I made a patch to update libtool to version 1.4.3. This patch is by no means complete and i *bet* there are some issues with it. I just made it, because i need it to bootstrap the QuakeForge CVS.
I compiled several ports with this new version and haven't had any errors (yet).
>How-To-Repeat:
To really use this patch, you have to remove/alter the check for the libtool-version in Mk/bsd.port.mk around line 2655.
>Fix:
here is the patch, i hope it works...
--- patch begins here ---
--- Makefile.orig Wed Oct 16 17:13:34 2002
+++ Makefile Wed Oct 16 17:20:57 2002
@@ -6,17 +6,12 @@
#
PORTNAME= libtool
-PORTVERSION= 1.3.4
-PORTREVISION= 4
+PORTVERSION= 1.4.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= ports@FreeBSD.org
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed. If someone can supply a
-# working patch then it will be upgraded.
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
--- distinfo.orig Wed Oct 16 17:13:41 2002
+++ distinfo Wed Oct 16 17:32:28 2002
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.4.2.tar.gz) = 95dd3de3b249fe1199ed60ed8e46f60c
--- pkg-plist.orig Wed Oct 16 17:13:47 2002
+++ pkg-plist Wed Oct 16 19:08:27 2002
@@ -4,26 +4,31 @@
@unexec install-info --delete %D/info/libtool.info %D/info/dir
info/libtool.info
@exec install-info %D/info/libtool.info %D/info/dir
+info/libtool.info-1
+info/libtool.info-2
+info/libtool.info-3
+info/libtool.info-4
+info/libtool.info-5
lib/libltdl.a
+lib/libltdl.la
lib/libltdl.so
-lib/libltdl.so.1
+lib/libltdl.so.4
share/aclocal/libtool.m4
+share/aclocal/ltdl.m4
share/libtool/config.guess
share/libtool/config.sub
share/libtool/libltdl/COPYING.LIB
share/libtool/libltdl/Makefile.am
share/libtool/libltdl/Makefile.in
share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
share/libtool/libltdl/acinclude.m4
share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
+share/libtool/libltdl/config-h.in
share/libtool/libltdl/configure
share/libtool/libltdl/configure.in
share/libtool/libltdl/ltdl.c
share/libtool/libltdl/ltdl.h
share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
share/libtool/ltmain.sh
@dirrm share/libtool/libltdl
@dirrm share/libtool
--- files/patch-ab.orig Wed Oct 16 17:33:06 2002
+++ files/patch-ab Wed Oct 16 17:36:24 2002
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999
-+++ doc/Makefile.in Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
+--- Makefile.in.orig Wed Oct 16 17:35:37 2002
++++ Makefile.in Wed Oct 16 17:36:00 2002
+@@ -74,7 +74,7 @@
+ LD = @LD@
LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
NM = @NM@
OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
+ OBJEXT = @OBJEXT@
--- files/patch-ad.orig Wed Oct 16 17:33:13 2002
+++ files/patch-ad Wed Oct 16 18:18:09 2002
@@ -1,247 +1,71 @@
-
-$FreeBSD: ports/devel/libtool/files/patch-ad,v 1.8 2002/05/02 07:49:56 sobomax Exp $
-
---- ltmain.sh.orig Tue Dec 7 23:50:49 1999
-+++ ltmain.sh Thu May 2 10:24:05 2002
-@@ -23,6 +23,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
+--- acinclude.m4.orig Wed Oct 16 18:04:22 2002
++++ acinclude.m4 Wed Oct 16 18:14:48 2002
+@@ -756,7 +756,7 @@
+ test -z "$CC" && CC=cc
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
++test -z "$LN_S" && LN_S="ln -sf"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -1933,7 +1933,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec="/lib /usr/lib"
+
+ case $host_os in
+ aix3*)
+--- aclocal.m4.orig Wed Oct 16 18:04:27 2002
++++ aclocal.m4 Wed Oct 16 18:15:30 2002
+@@ -746,7 +746,7 @@
+ test -z "$CC" && CC=cc
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
++test -z "$LN_S" && LN_S="ln -sf"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -1885,7 +1885,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec="/lib /usr/lib"
+
+ case $host_os in
+ aix3*)
+--- libtool.m4.orig Wed Oct 16 18:04:41 2002
++++ libtool.m4 Wed Oct 16 18:14:48 2002
+@@ -756,7 +756,7 @@
+ test -z "$CC" && CC=cc
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
++test -z "$LN_S" && LN_S="ln -sf"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -1933,7 +1933,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec="/lib /usr/lib"
+
+ case $host_os in
+ aix3*)
+--- libtoolize.in.orig Wed Oct 16 18:16:16 2002
++++ libtoolize.in Wed Oct 16 18:16:35 2002
+@@ -43,7 +43,7 @@
+ dry_run=no
+ help="Try \`$progname --help' for more information."
+ rm="rm -f"
+-ln_s="ln -s"
++ln_s="ln -sf"
+ cp="cp -f"
+ mkdir="mkdir"
-+EXPR_COMPAT=1
-+export EXPR_COMPAT
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
-@@ -54,7 +57,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
-
- default_mode=
-@@ -952,7 +955,11 @@
- continue
- ;;
- release)
-- release="-$arg"
-+ if test "$release_suffix" = all; then
-+ release="$arg"
-+ elif test "$release_suffix" = yes; then
-+ release="-$arg"
-+ fi
- prev=
- continue
- ;;
-@@ -1005,6 +1012,7 @@
- ;;
-
- -avoid-version)
-+ build_old_libs=no
- avoid_version=yes
- continue
- ;;
-@@ -1091,6 +1099,10 @@
- deplibs="$deplibs $arg"
- ;;
-
-+ -?thread)
-+ deplibs="$deplibs $arg"
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -1168,7 +1180,7 @@
-
- *.o | *.obj | *.a | *.lib)
- # A standard object.
-- objs="$objs $arg"
-+ libobjs="$libobjs $arg"
- ;;
-
- *.lo)
-@@ -1603,12 +1615,6 @@
- exit 1
- fi
-
-- # How the heck are we supposed to write a wrapper for a shared library?
-- if test -n "$link_against_libtool_libs"; then
-- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
-- exit 1
-- fi
--
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
- fi
-@@ -1795,6 +1801,9 @@
- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- # these systems don't actually have a c library (as such)!
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems.
- deplibs="$deplibs -lc"
-@@ -1802,6 +1811,94 @@
- esac
- fi
-
-+ if test -n "$rpath$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ for libdir in $rpath $xrpath; do
-+ # This is the magic to use -rpath.
-+ case "$compile_rpath " in
-+ *" $libdir "*) ;;
-+ *) compile_rpath="$compile_rpath $libdir" ;;
-+ esac
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ fi
-+
-+ # Now hardcode the library paths
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $compile_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ compile_rpath="$rpath"
-+
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$finalize_perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ finalize_rpath="$rpath"
-+
- # Create the output directory, or remove our outputs if we need to.
- if test -d $output_objdir; then
- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1914,11 @@
-
- # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-- oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+ else
-+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+ fi
-
- # Transform .lo files to .o files.
- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2112,11 @@
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
- fi
- if test "$build_old_libs" = no; then
-- oldlibs="$output_objdir/$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ oldlibs="$output_objdir/$libname$release.$libext"
-+ else
-+ oldlibs="$output_objdir/$libname.$libext"
-+ fi
- build_libtool_libs=module
- build_old_libs=yes
- else
-@@ -3059,7 +3164,11 @@
- case "$output" in
- *.la)
- old_library=
-- test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+ else
-+ test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ fi
- $show "creating $output"
-
- if test -n "$xrpath"; then
-@@ -3348,10 +3457,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-- instname="$dir/$name"i
-- $show "$install_prog $instname $destdir/$name"
-- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ if test "$install_ltlibs" = yes; then
-+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ instname="$dir/$name"i
-+ $show "$install_prog $instname $destdir/$name"
-+ $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-@@ -3440,7 +3551,6 @@
- fi
- libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- if test -n "$libdir" && test ! -f "$libfile"; then
-- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- finalize=no
- fi
- done
--- files/patch-ae.orig Wed Oct 16 17:33:17 2002
+++ files/patch-ae Wed Oct 16 18:51:35 2002
@@ -1,6 +1,52 @@
---- configure.orig Fri Jul 2 09:01:56 1999
-+++ configure Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
+--- configure.orig Tue Sep 11 05:33:00 2001
++++ configure Wed Oct 16 18:49:59 2002
+@@ -1561,13 +1561,13 @@
+ if ln -s X conftestdata 2>/dev/null
+ then
+ rm -f conftestdata
+- ac_cv_prog_LN_S="ln -s"
++ ac_cv_prog_LN_S="ln -sf"
+ else
+ ac_cv_prog_LN_S=ln
+ fi
+ fi
+ LN_S="$ac_cv_prog_LN_S"
+-if test "$ac_cv_prog_LN_S" = "ln -s"; then
++if test "$ac_cv_prog_LN_S" = "ln -sf"; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+@@ -2942,7 +2942,7 @@
+ test -z "$CC" && CC=cc
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
++test -z "$LN_S" && LN_S="ln -sf"
+ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+ test -z "$NM" && NM=nm
+ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -4178,7 +4178,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec="/lib /usr/lib"
+
+ case $host_os in
+ aix3*)
+@@ -6028,11 +6028,6 @@
+ top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+-
+ echo creating "$ac_file"
+ rm -f "$ac_file"
+ configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+@@ -6184,10 +6179,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
--- files/patch-af.orig Wed Oct 16 17:33:21 2002
+++ files/patch-af Wed Oct 16 18:41:52 2002
@@ -1,6 +1,6 @@
---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999
-+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
+--- libltdl/Makefile.in.orig Wed Oct 16 18:11:03 2002
++++ libltdl/Makefile.in Wed Oct 16 18:12:00 2002
+@@ -345,17 +345,16 @@
distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
--- files/patch-ac.orig Wed Oct 16 17:33:10 2002
+++ /dev/null Wed Oct 16 19:08:48 2002
@@ -1,157 +0,0 @@
-
-$FreeBSD: ports/devel/libtool/files/patch-ac,v 1.11 2002/06/08 08:57:34 sobomax Exp $
-
---- ltconfig.orig Tue Dec 7 23:50:48 1999
-+++ ltconfig Sat Jun 8 11:48:12 2002
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
-
- Generate a system-specific libtool script.
-
-+ --build no-op to keep compatability with configure scripts generated for 1.4
- --debug enable verbose shell tracing
- --disable-shared do not build shared libraries
- --disable-static do not build static libraries
- --disable-fast-install do not optimize for fast installation
-+ --disable-ltlibs don't install the .la archives
-+ --release-ignore don't use -release specification
-+ --release-suffix use -release suffix for all files
- --enable-dlopen enable dlopen support
- --enable-win32-dll enable building dlls on win32 hosts
- --help display this help and exit
-@@ -268,6 +274,8 @@
- exit 0
- ;;
-
-+ --build=*) ;;
-+
- --debug)
- echo "$progname: enabling shell trace mode"
- set -x
-@@ -279,6 +287,12 @@
-
- --disable-fast-install) enable_fast_install=no ;;
-
-+ --disable-ltlibs) install_ltlibs=no ;;
-+
-+ --release-ignore) release_suffix=no ;;
-+
-+ --release-suffix) release_suffix=all ;;
-+
- --enable-dlopen) enable_dlopen=yes ;;
-
- --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
- $rm conftest.dat
- if ln -s X conftest.dat 2>/dev/null; then
- $rm conftest.dat
-- LN_S="ln -s"
-+ LN_S="ln -sf"
- else
- LN_S=ln
- fi
-- if test "$LN_S" = "ln -s"; then
-+ if test "$LN_S" = "ln -sf"; then
- echo "$ac_t"yes 1>&6
- else
- echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
-
- *)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
-@@ -1353,14 +1367,6 @@
- hardcode_shlibpath_var=no
- ;;
-
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
-- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- ;;
--
- hpux9* | hpux10* | hpux11*)
- case "$host_os" in
- hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1873,19 +1879,22 @@
- version_type=freebsd-$objformat
- case "$version_type" in
- freebsd-elf*)
-- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-- file_magic_cmd=/usr/bin/file
-- file_magic_test_file=`echo /usr/lib/libc.so*`
-- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-- need_version=no
-- need_lib_prefix=no
-+ deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'
- ;;
- freebsd-*)
-- deplibs_check_method=unknown
-- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-- need_version=yes
-+ deplibs_check_method='file_magic FreeBSD.* shared library'
- ;;
- esac
-+ file_magic_cmd=/usr/bin/file
-+ file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ if test "$release_suffix" = all; then
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+ else
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+ fi
-+ need_version=no
-+ need_lib_prefix=no
-+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- case "$host_os" in
- freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
-
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs
-+
-+# What to do with -release.
-+# yes - only for shared archive
-+# no - ingnore
-+# all - for all archives
-+release_suffix=$release_suffix
-
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
--- files/patch-ag.orig Wed Oct 16 17:33:25 2002
+++ /dev/null Wed Oct 16 19:08:48 2002
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/devel/libtool/files/patch-ag,v 1.1 2001/02/05 08:21:54 reg Exp $
-
---- libltdl/configure 2001/01/31 10:58:38 1.1
-+++ libltdl/configure 2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
-
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--- patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210162017.g9GKHRcN002270>