Index: third_party/sqlite/src/ltmain.sh |
diff --git a/third_party/libxml/src/ltmain.sh b/third_party/sqlite/src/ltmain.sh |
old mode 100755 |
new mode 100644 |
similarity index 99% |
copy from third_party/libxml/src/ltmain.sh |
copy to third_party/sqlite/src/ltmain.sh |
index a72f2fd78bfc86bb35a404d1954c4ca9bb923c06..0634c4bccce12e53a48e3ba015df80305b579618 |
--- a/third_party/libxml/src/ltmain.sh |
+++ b/third_party/sqlite/src/ltmain.sh |
@@ -1,6 +1,6 @@ |
# Generated from ltmain.m4sh. |
-# ltmain.sh (GNU libtool) 2.2.6b |
+# ltmain.sh (GNU libtool) 2.2.6 |
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. |
@@ -65,7 +65,7 @@ |
# compiler: $LTCC |
# compiler flags: $LTCFLAGS |
# linker: $LD (gnu? $with_gnu_ld) |
-# $progname: (GNU libtool) 2.2.6b |
+# $progname: (GNU libtool) 2.2.6 |
# automake: $automake_version |
# autoconf: $autoconf_version |
# |
@@ -73,9 +73,9 @@ |
PROGRAM=ltmain.sh |
PACKAGE=libtool |
-VERSION=2.2.6b |
+VERSION=2.2.6 |
TIMESTAMP="" |
-package_revision=1.3017 |
+package_revision=1.3012 |
# Be Bourne compatible |
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
@@ -116,15 +116,15 @@ $lt_unset CDPATH |
: ${CP="cp -f"} |
: ${ECHO="echo"} |
-: ${EGREP="/bin/grep -E"} |
-: ${FGREP="/bin/grep -F"} |
-: ${GREP="/bin/grep"} |
+: ${EGREP="/usr/bin/grep -E"} |
+: ${FGREP="/usr/bin/grep -F"} |
+: ${GREP="/usr/bin/grep"} |
: ${LN_S="ln -s"} |
: ${MAKE="make"} |
: ${MKDIR="mkdir"} |
: ${MV="mv -f"} |
: ${RM="rm -f"} |
-: ${SED="/bin/sed"} |
+: ${SED="/opt/local/bin/gsed"} |
: ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
: ${Xsed="$SED -e 1s/^X//"} |
@@ -570,6 +570,13 @@ else |
# Restart under the correct shell, and then maybe $ECHO will work. |
exec $SHELL "$progpath" --no-reexec ${1+"$@"} |
fi |
+# Same for EGREP, and just to be sure, do LTCC as well |
+if test "x$EGREP" = x ; then |
+ EGREP=egrep |
+fi |
+if test "x$LTCC" = x ; then |
+ LTCC=${CC-gcc} |
+fi |
if test "X$1" = X--fallback-echo; then |
# used as fallback echo |
@@ -8059,9 +8066,53 @@ EOF |
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
test -z "$libdir" && \ |
func_fatal_error "\`$deplib' is not a valid libtool archive" |
- newdependency_libs="$newdependency_libs $libdir/$name" |
+ if test "x$EGREP" = x ; then |
+ EGREP=egrep |
+ fi |
+ # We do not want portage's install root ($D) present. Check only for |
+ # this if the .la is being installed. |
+ if test "$installed" = yes && test "$D"; then |
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
+ else |
+ mynewdependency_lib="$libdir/$name" |
+ fi |
+ # Do not add duplicates |
+ if test "$mynewdependency_lib"; then |
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
+ if test -z "$my_little_ninja_foo_1"; then |
+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
+ fi |
+ fi |
+ ;; |
+ *) |
+ if test "$installed" = yes; then |
+ # Rather use S=WORKDIR if our version of portage supports it. |
+ # This is because some ebuild (gcc) do not use $S as buildroot. |
+ if test "$PWORKDIR"; then |
+ S="$PWORKDIR" |
+ fi |
+ # We do not want portage's build root ($S) present. |
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"` |
+ # We do not want portage's install root ($D) present. |
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"` |
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then |
+ mynewdependency_lib="" |
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then |
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
+ else |
+ mynewdependency_lib="$deplib" |
+ fi |
+ else |
+ mynewdependency_lib="$deplib" |
+ fi |
+ # Do not add duplicates |
+ if test "$mynewdependency_lib"; then |
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"` |
+ if test -z "$my_little_ninja_foo_4"; then |
+ newdependency_libs="$newdependency_libs $mynewdependency_lib" |
+ fi |
+ fi |
;; |
- *) newdependency_libs="$newdependency_libs $deplib" ;; |
esac |
done |
dependency_libs="$newdependency_libs" |
@@ -8125,6 +8176,10 @@ EOF |
case $host,$output,$installed,$module,$dlname in |
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; |
esac |
+ # Do not add duplicates |
+ if test "$installed" = yes && test "$D"; then |
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'` |
+ fi |
$ECHO > $output "\ |
# $outputname - a libtool library file |
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION |