rpms/binutils/devel binutils-2.17.50.0.17-ltconfig-multilib.patch, 1.1, 1.2
Jakub Jelinek (jakub)
fedora-extras-commits at redhat.com
Wed Jun 27 17:56:10 UTC 2007
Author: jakub
Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26181
Modified Files:
binutils-2.17.50.0.17-ltconfig-multilib.patch
Log Message:
2.17.50.0.17-1
binutils-2.17.50.0.17-ltconfig-multilib.patch:
Index: binutils-2.17.50.0.17-ltconfig-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils-2.17.50.0.17-ltconfig-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- binutils-2.17.50.0.17-ltconfig-multilib.patch 27 Jun 2007 17:05:15 -0000 1.1
+++ binutils-2.17.50.0.17-ltconfig-multilib.patch 27 Jun 2007 17:56:02 -0000 1.2
@@ -1,40 +1,6 @@
---- libtool.m4.jj 2007-06-18 13:29:28.000000000 -0400
-+++ libtool.m4 2007-06-27 13:01:14.000000000 -0400
-@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu)
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # find out which ABI we are using
-+ libsuff=
-+ case "$host_cpu" in
-+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *64-bit*)
-+ libsuff=64
-+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
-+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-+ fi
-+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+ esac
-+
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
--- binutils/configure.jj 2007-06-18 13:29:28.000000000 -0400
-+++ binutils/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -8990,10 +8990,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ binutils/configure 2007-06-27 13:55:07.000000000 -0400
+@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -42,8 +8,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -67,7 +37,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- binutils/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
-+++ binutils/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ binutils/aclocal.m4 2007-06-27 13:55:07.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -129,7 +99,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -143,8 +113,8 @@
esac
fi
--- opcodes/configure.jj 2007-06-18 13:29:29.000000000 -0400
-+++ opcodes/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -8420,10 +8420,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ opcodes/configure 2007-06-27 13:55:08.000000000 -0400
+@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -152,8 +122,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -177,7 +151,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- opcodes/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
-+++ opcodes/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ opcodes/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -239,7 +213,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -253,8 +227,8 @@
esac
fi
--- gprof/configure.jj 2007-06-18 13:29:29.000000000 -0400
-+++ gprof/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -8250,10 +8250,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ gprof/configure 2007-06-27 13:55:08.000000000 -0400
+@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -262,8 +236,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -287,7 +265,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- gprof/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
-+++ gprof/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ gprof/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -349,7 +327,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -363,8 +341,8 @@
esac
fi
--- ld/configure.jj 2007-06-18 13:29:29.000000000 -0400
-+++ ld/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -8253,10 +8253,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ ld/configure 2007-06-27 13:55:08.000000000 -0400
+@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -372,8 +350,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -397,7 +379,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- ld/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
-+++ ld/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ ld/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -459,7 +441,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -473,8 +455,8 @@
esac
fi
--- gas/configure.jj 2007-06-18 13:29:28.000000000 -0400
-+++ gas/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -8252,10 +8252,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ gas/configure 2007-06-27 13:55:08.000000000 -0400
+@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -482,8 +464,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -507,7 +493,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- gas/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
-+++ gas/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ gas/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -569,7 +555,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -583,8 +569,8 @@
esac
fi
--- bfd/configure.jj 2007-06-18 13:29:28.000000000 -0400
-+++ bfd/configure 2007-06-27 12:59:23.000000000 -0400
-@@ -9156,10 +9156,30 @@ rm -f conftest.err conftest.$ac_objext \
++++ bfd/configure 2007-06-27 13:55:08.000000000 -0400
+@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \
# before this can be enabled.
hardcode_into_libs=yes
@@ -592,8 +578,12 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
-+ echo '#line $LINENO "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
++ echo 'int i;' > conftest.$ac_ext
++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
@@ -617,7 +607,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
--- bfd/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
-+++ bfd/aclocal.m4 2007-06-27 13:01:14.000000000 -0400
++++ bfd/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
@@ -1206,16 +1206,49 @@ version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -679,7 +669,7 @@
- x86_64*|s390x*|powerpc64*)
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
-+ echo '[#]line $LINENO "configure"' > conftest.$ac_ext
++ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
@@ -692,3 +682,37 @@
;;
esac
fi
+--- libtool.m4.jj 2007-06-18 13:29:28.000000000 -0400
++++ libtool.m4 2007-06-27 13:55:08.000000000 -0400
+@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # find out which ABI we are using
++ libsuff=
++ case "$host_cpu" in
++ x86_64*|s390*|powerpc*|ppc*|sparc*)
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *64-bit*)
++ libsuff=64
++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
++ fi
++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++ esac
++
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
More information about the fedora-extras-commits
mailing list