aboutsummaryrefslogtreecommitdiff
path: root/devel/gnu-libtool/files/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnu-libtool/files/patch-ad')
-rw-r--r--devel/gnu-libtool/files/patch-ad241
1 files changed, 22 insertions, 219 deletions
diff --git a/devel/gnu-libtool/files/patch-ad b/devel/gnu-libtool/files/patch-ad
index 3ec71700ffbb..c04c4dd4a24c 100644
--- a/devel/gnu-libtool/files/patch-ad
+++ b/devel/gnu-libtool/files/patch-ad
@@ -1,226 +1,32 @@
$FreeBSD$
---- 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.
+--- ltmain.sh.orig Mon Sep 10 22:33:26 2001
++++ ltmain.sh Wed Jan 23 16:39:22 2002
+@@ -1062,6 +1062,12 @@
-+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
++ case $host in
++ *-*-freebsd*)
++ # Do not build the useless static library
++ build_old_libs=no
++ ;;
++ esac
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)!
+@@ -2444,6 +2450,9 @@
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
;;
+ *-*-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 @@
+ # Add libc to deplibs on all other systems if necessary.
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4219,17 @@
fi
# Install the pseudo-library for information purposes.
@@ -228,20 +34,17 @@ $FreeBSD$
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ if test "$install_ltlibs" = yes; then
++ case $host in
++ *-*-freebsd*)
++ # Do not install the useless pseudo-library
++ ;;
++ *)
+ 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
++ ;;
++ esac
# 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