diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-05-02 15:49:56 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-05-02 15:49:56 +0800 |
| commit | 2dc040af0ef326a88cd1feedd27415081f625d80 (patch) | |
| tree | dd652f53a3307563d66a610f5ed4c1fed3396764 /devel/libtool15/files | |
| parent | 59550f66987e7697f1dffee6b7c9e2fd29d11d22 (diff) | |
| download | freebsd-ports-gnome-2dc040af0ef326a88cd1feedd27415081f625d80.tar.gz freebsd-ports-gnome-2dc040af0ef326a88cd1feedd27415081f625d80.tar.zst freebsd-ports-gnome-2dc040af0ef326a88cd1feedd27415081f625d80.zip | |
Set EXPR_COMPAT environment variable to workaround a problem with expr(1)
on -current.
Diffstat (limited to 'devel/libtool15/files')
| -rw-r--r-- | devel/libtool15/files/patch-ad | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/devel/libtool15/files/patch-ad b/devel/libtool15/files/patch-ad index 2aed241fd3e0..3ec71700ffbb 100644 --- a/devel/libtool15/files/patch-ad +++ b/devel/libtool15/files/patch-ad @@ -1,6 +1,19 @@ ---- ltmain.sh.orig Tue Dec 7 13:50:49 1999 -+++ ltmain.sh Mon Jan 17 16:33:06 2000 -@@ -54,7 +54,7 @@ + +$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. + ++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 @@ -9,7 +22,7 @@ TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" default_mode= -@@ -952,7 +952,11 @@ +@@ -952,7 +955,11 @@ continue ;; release) @@ -22,7 +35,7 @@ prev= continue ;; -@@ -1005,6 +1009,7 @@ +@@ -1005,6 +1012,7 @@ ;; -avoid-version) @@ -30,7 +43,7 @@ avoid_version=yes continue ;; -@@ -1091,6 +1096,10 @@ +@@ -1091,6 +1099,10 @@ deplibs="$deplibs $arg" ;; @@ -41,7 +54,7 @@ -module) module=yes continue -@@ -1168,7 +1177,7 @@ +@@ -1168,7 +1180,7 @@ *.o | *.obj | *.a | *.lib) # A standard object. @@ -50,7 +63,7 @@ ;; *.lo) -@@ -1603,12 +1612,6 @@ +@@ -1603,12 +1615,6 @@ exit 1 fi @@ -63,7 +76,7 @@ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 fi -@@ -1795,6 +1798,9 @@ +@@ -1795,6 +1801,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -73,7 +86,7 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1802,6 +1808,94 @@ +@@ -1802,6 +1811,94 @@ esac fi @@ -168,7 +181,7 @@ # 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 +1911,11 @@ +@@ -1817,7 +1914,11 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then @@ -181,7 +194,7 @@ # Transform .lo files to .o files. oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2011,7 +2109,11 @@ +@@ -2011,7 +2112,11 @@ echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -194,7 +207,7 @@ build_libtool_libs=module build_old_libs=yes else -@@ -3059,7 +3161,11 @@ +@@ -3059,7 +3164,11 @@ case "$output" in *.la) old_library= @@ -207,7 +220,7 @@ $show "creating $output" if test -n "$xrpath"; then -@@ -3348,10 +3454,12 @@ +@@ -3348,10 +3457,12 @@ fi # Install the pseudo-library for information purposes. @@ -224,7 +237,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3440,7 +3548,6 @@ +@@ -3440,7 +3551,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then |