Bug 683975 - backport libtool's 74c8993c178a1386ea5e2363a01d919738402f30. r=rail.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Tue, 08 May 2012 10:12:07 -0400
changeset 95767 9c9dc2ee76effc55aa83930fac94c13d3b75be8c
parent 95766 800b381a1638b17cff5925fac900371018aa9eda
child 95768 f068fd4d02d05d8b5d9c451a5932619e7eaf6fe4
push id1439
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 20:19:22 +0000
treeherdermozilla-aurora@ea74834dccd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrail
bugs683975
milestone15.0a1
Bug 683975 - backport libtool's 74c8993c178a1386ea5e2363a01d919738402f30. r=rail.
build/unix/build-toolchain/build-gcc.py
build/unix/build-toolchain/libtool-74c8993c178a1386ea5e2363a01d919738402f30.patch
--- a/build/unix/build-toolchain/build-gcc.py
+++ b/build/unix/build-toolchain/build-gcc.py
@@ -249,16 +249,17 @@ if not os.path.exists(source_dir):
     extract(tar_source_tar, source_dir)
     extract(make_source_tar, source_dir)
     extract(unifdef_source_tar, source_dir)
     extract(mpc_source_tar, source_dir)
     extract(mpfr_source_tar, source_dir)
     extract(gmp_source_tar, source_dir)
     extract(gcc_source_tar, source_dir)
     patch('plugin_finish_decl.diff', 0, gcc_source_dir)
+    patch('libtool-74c8993c178a1386ea5e2363a01d919738402f30.patch', 1, gcc_source_dir)
     patch('pr49911.diff', 1, gcc_source_dir)
     patch('r159628-r163231-r171807.patch', 1, gcc_source_dir)
     patch('gcc-fixinc.patch', 1, gcc_source_dir)
     patch('gcc-include.patch', 1, gcc_source_dir)
 
 if os.path.exists(build_dir):
     shutil.rmtree(build_dir)
 os.makedirs(build_dir)
new file mode 100644
--- /dev/null
+++ b/build/unix/build-toolchain/libtool-74c8993c178a1386ea5e2363a01d919738402f30.patch
@@ -0,0 +1,12 @@
+diff -ruN a/ltmain.sh b/ltmain.sh
+--- a/ltmain.sh	2009-12-05 12:18:53.000000000 -0500
++++ b/ltmain.sh	2012-05-07 16:19:31.871827967 -0400
+@@ -2932,7 +2932,7 @@
+         func_extract_an_archive "$my_xdir" "$my_xabs"
+ 	;;
+       esac
+-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+     done
+ 
+     func_extract_archives_result="$my_oldobjs"