librep-libtool diff between working and broken rep-gtk-compile.

librep-libtool.diff (text/plain), 12.47 KB, created by Michael Haubenwallner (RETIRED) on 2005-06-20 02:10:30 UTC

--- /usr/lib/rep/i686-pc-linux-gnu/libtool	2004-04-30 17:57:22.000000000 +0200
+++ /var/tmp/portage/librep-0.17/image/usr/lib/rep/i686-pc-linux-gnu/libtool	2005-06-20 10:16:21.000000000 +0200
@@ -44,7 +44,7 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host sapc154new:
+# Libtool was configured on host sapc154:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -72,14 +72,14 @@
 echo="echo"
 
 # The archiver.
-AR="ar"
+AR="i686-pc-linux-gnu-ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="i686-pc-linux-gnu-gcc"
 
 # A language-specific compiler.
-CC="gcc"
+CC="i686-pc-linux-gnu-gcc"
 
 # Is the compiler the GNU C compiler?
 with_gcc=yes
@@ -94,10 +94,10 @@
 LN_S="ln -s"
 
 # A BSD-compatible nm program.
-NM="nm"
+NM="/usr/bin/i686-pc-linux-gnu-nm -B"
 
 # A symbol stripping program
-STRIP="strip"
+STRIP="i686-pc-linux-gnu-strip"
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=file
@@ -190,7 +190,7 @@
 soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
-RANLIB="ranlib"
+RANLIB="i686-pc-linux-gnu-ranlib"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
 old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
 old_postuninstall_cmds=""
@@ -215,8 +215,8 @@
 module_expsym_cmds=""
 
 # Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
+old_striplib="i686-pc-linux-gnu-strip --strip-debug"
+striplib="i686-pc-linux-gnu-strip --strip-unneeded"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -316,7 +316,7 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../ /lib/i686-pc-linux-gnu/3.3.2/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../ /lib/i686-pc-linux-gnu/3.3.5-20050130/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/"
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -391,8 +391,10 @@
   exit 0
 fi
 
-# define SED for historic ltconfig's generated by Libtool 1.3
+# define variables for historic ltconfig's generated by Libtool 1.3
 test -z "$SED" && SED=sed
+test -z "$EGREP" && EGREP=egrep
+test -z "$LTCC" && LTCC=${CC-gcc}
 
 # The name of this program.
 progname=`$echo "$0" | ${SED} 's%^.*/%%'`
@@ -5457,30 +5459,33 @@
 		# 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'`"
+		  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
-		  if test -z "`echo $newdependency_libs |grep -e "$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.
+		  # 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.
-		  if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
+		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
 		    mynewdependency_lib=""
 		  # We do not want portage's install root ($D) present.
-		  elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
-		    eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
+		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+		  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
@@ -5489,7 +5494,8 @@
 		fi
 		# Do not add duplicates
 		if test "$mynewdependency_lib"; then
-		  if test -z "`echo $newdependency_libs |grep -e "$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
@@ -5547,7 +5553,7 @@
 	  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'`"
+	    install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
 	  fi
 	  $echo > $output "\
 # $outputname - a libtool library file
@@ -6737,7 +6743,7 @@
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host sapc154new:
+# Libtool was configured on host sapc154:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -6765,14 +6771,14 @@
 echo="echo"
 
 # The archiver.
-AR="ar"
+AR="i686-pc-linux-gnu-ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="i686-pc-linux-gnu-gcc"
 
 # A language-specific compiler.
-CC="g++"
+CC="i686-pc-linux-gnu-g++"
 
 # Is the compiler the GNU C compiler?
 with_gcc=yes
@@ -6787,10 +6793,10 @@
 LN_S="ln -s"
 
 # A BSD-compatible nm program.
-NM="nm"
+NM="/usr/bin/i686-pc-linux-gnu-nm -B"
 
 # A symbol stripping program
-STRIP="strip"
+STRIP="i686-pc-linux-gnu-strip"
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=file
@@ -6883,7 +6889,7 @@
 soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
-RANLIB="ranlib"
+RANLIB="i686-pc-linux-gnu-ranlib"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
 old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
 old_postuninstall_cmds=""
@@ -6905,16 +6911,16 @@
 module_expsym_cmds=""
 
 # Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
+old_striplib="i686-pc-linux-gnu-strip --strip-debug"
+striplib="i686-pc-linux-gnu-strip --strip-unneeded"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../crti.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/crtbeginS.o"
+predep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../crti.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/crtbeginS.o"
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/crtendS.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../crtn.o"
+postdep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/crtendS.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../crtn.o"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -6926,7 +6932,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2 -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130 -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../.."
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -7006,7 +7012,7 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../ /lib/i686-pc-linux-gnu/3.3.2/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../ /lib/i686-pc-linux-gnu/3.3.5-20050130/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/"
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7033,7 +7039,7 @@
 
 # ### BEGIN LIBTOOL TAG CONFIG: F77
 
-# Libtool was configured on host sapc154new:
+# Libtool was configured on host sapc154:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -7061,11 +7067,11 @@
 echo="echo"
 
 # The archiver.
-AR="ar"
+AR="i686-pc-linux-gnu-ar"
 AR_FLAGS="cru"
 
 # A C compiler.
-LTCC="gcc"
+LTCC="i686-pc-linux-gnu-gcc"
 
 # A language-specific compiler.
 CC="i686-pc-linux-gnu-g77"
@@ -7083,10 +7089,10 @@
 LN_S="ln -s"
 
 # A BSD-compatible nm program.
-NM="nm"
+NM="/usr/bin/i686-pc-linux-gnu-nm -B"
 
 # A symbol stripping program
-STRIP="strip"
+STRIP="i686-pc-linux-gnu-strip"
 
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=file
@@ -7179,7 +7185,7 @@
 soname_spec="\${libname}\${release}\${shared_ext}\$major"
 
 # Commands used to build and install an old-style archive.
-RANLIB="ranlib"
+RANLIB="i686-pc-linux-gnu-ranlib"
 old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
 old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
 old_postuninstall_cmds=""
@@ -7204,8 +7210,8 @@
 module_expsym_cmds=""
 
 # Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
+old_striplib="i686-pc-linux-gnu-strip --strip-debug"
+striplib="i686-pc-linux-gnu-strip --strip-unneeded"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -7305,7 +7311,7 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../i686-pc-linux-gnu/3.3.2/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2/../../../ /lib/i686-pc-linux-gnu/3.3.2/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.2/ /usr/lib/"
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.5-20050130/../../../ /lib/i686-pc-linux-gnu/3.3.5-20050130/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.5-20050130/ /usr/lib/"
 
 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec="/lib /usr/lib"