diff options
Diffstat (limited to 'devel/libtool13/files/patch-ad')
| -rw-r--r-- | devel/libtool13/files/patch-ad | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/devel/libtool13/files/patch-ad b/devel/libtool13/files/patch-ad index 3ec71700ffbb..304e840caaa9 100644 --- a/devel/libtool13/files/patch-ad +++ b/devel/libtool13/files/patch-ad @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Tue Dec 7 23:50:49 1999 -+++ ltmain.sh Thu May 2 10:24:05 2002 +--- ltmain.sh.orig Sat May 27 07:15:01 2000 ++++ ltmain.sh Fri Dec 13 23:50:12 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. @@ -17,20 +14,19 @@ $FreeBSD$ # 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)" +-VERSION=1.3.5 ++VERSION=1.3.5-freebsd-ports + TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)" 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" + release="-$arg" + fi prev= continue @@ -76,9 +72,9 @@ $FreeBSD$ 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)! +@@ -1799,6 +1805,9 @@ + # rhapsody is a little odd... + deplibs="$deplibs -framework System" ;; + *-*-freebsd*) + # FreeBSD doesn't need this... @@ -86,7 +82,7 @@ $FreeBSD$ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1802,6 +1811,94 @@ +@@ -1806,6 +1815,94 @@ esac fi @@ -181,63 +177,56 @@ $FreeBSD$ # 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 @@ +@@ -1821,7 +1918,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" + 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 @@ +@@ -2015,7 +2116,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" + oldlibs="$output_objdir/$libname.$libext" + fi build_libtool_libs=module build_old_libs=yes else -@@ -3059,7 +3164,11 @@ +@@ -3071,7 +3176,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" + test "$build_old_libs" = yes && old_library="$libname.$libext" + fi $show "creating $output" if test -n "$xrpath"; then -@@ -3348,10 +3457,12 @@ +@@ -3360,10 +3469,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 $? + 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 @@ +@@ -3452,7 +3563,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then |