main/xulrunner: autodetect libc.so filename properly

Submitted upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=878791#c7

3 files changed, 46 insertions, 15 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 9a5fa7e52d..25e1f417bf 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=xulrunner
 pkgver=21.0
 _ffoxver=$pkgver
-pkgrel=0
+pkgrel=1
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -55,7 +55,7 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	sysconf.patch
 	ns_min.patch
 	stat.patch
-	alpine-libc.patch
+	moz-libc-filename.patch
 	"
 # help our shared-object scanner to find the libs
 ldpath="/usr/lib/xulrunner-$pkgver"
@@ -126,7 +126,7 @@ d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 760c05f196bb6f152d7f895742e6aa02  sysconf.patch
 1555e753821d7dd1a731a33fcb1f741b  ns_min.patch
 623cd16618c57f037ab4132dfe8694b0  stat.patch
-692099e5c2da4dffb56d979d5dabe545  alpine-libc.patch"
+10600ca1b36ff177bf4e301056553cf4  moz-libc-filename.patch"
 sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c  firefox-21.0.source.tar.bz2
 ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674  mozconfig
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
@@ -137,7 +137,7 @@ d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 2dacfceeb78d352321a62c950eb50837307c57720719ea6424681c3f5b0ed1fd  sysconf.patch
 6fc6f05dd45826ce550902ce4c8feb11abacae94ede413628c37ff03a285f859  ns_min.patch
 41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df  stat.patch
-04333975eeb771c8ffd0db5d7fb7117fb2b508b06db72e9fa9f42e9ccf3bc606  alpine-libc.patch"
+b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db  moz-libc-filename.patch"
 sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822  firefox-21.0.source.tar.bz2
 914e0dfc9a531f6fbff07a9e250e1146371cbffb5eed7fffaa2c5643f8e7759d62d314b3c2dbc5cf9031b66001bbf05892c9ae5aa2b9e77ffe704837a2938f12  mozconfig
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
@@ -148,4 +148,4 @@ sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab
 0e8d21cd0cec34d7825e59f05669010f9f4bcfb94ca1f5788495cdbd25e9c845d4ca8fa028e599f3464bc4d7827a833708d4513c5082ffbcb5be423318048077  sysconf.patch
 0020796ab970a3e6a207e5a5b93251cc075d749dc642175fd811c7af0618b722a7f7d80d00318edc205cac21d14f8fc0487cdb623a558c5f52e936ae873ce4bc  ns_min.patch
 e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55  stat.patch
-f36b40a969bae6791be1c26aeeb235be66bb3b8fbf41322cabf0395e4050b72c189cf15ed56ba854b98c62169386e15052fef7f4c4f195a39c72b3f3a979a4bc  alpine-libc.patch"
+136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd  moz-libc-filename.patch"
diff --git a/main/xulrunner/alpine-libc.patch b/main/xulrunner/alpine-libc.patch
deleted file mode 100644
index e29e8afb55..0000000000
--- a/main/xulrunner/alpine-libc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-04-16 19:26:16.544461383 +0000
-+++ ./toolkit/components/osfile/osfile_unix_allthreads.jsm	2013-04-16 19:31:21.717350121 +0000
-@@ -40,6 +40,7 @@
-   // Open libc
-   let libc;
-   let libc_candidates =  [ "libSystem.B.dylib",
-+                           "libc.so.0.9.32",
-                            "libc.so.6",
-                            "libc.so" ];
-   for (let i = 0; i < libc_candidates.length; ++i) {
diff --git a/main/xulrunner/moz-libc-filename.patch b/main/xulrunner/moz-libc-filename.patch
new file mode 100644
index 0000000000..c8dfa1d84e
--- /dev/null
+++ b/main/xulrunner/moz-libc-filename.patch
@@ -0,0 +1,41 @@
+--- ./configure.in.orig	2013-06-07 09:49:55.984387546 +0000
++++ ./configure.in	2013-06-07 10:48:53.749411262 +0000
+@@ -273,6 +273,13 @@
+ AC_SUBST(OBJCOPY)
+ 
+ dnl ========================================================
++dnl Check the libc filename
++dnl ========================================================
++MOZ_LIBC_FILENAME=`$PYTHON -c "from ctypes.util import find_library; print(find_library('c'))"`
++AC_DEFINE_UNQUOTED(MOZ_LIBC_FILENAME, "$MOZ_LIBC_FILENAME")
++AC_SUBST(MOZ_LIBC_FILENAME)
++
++dnl ========================================================
+ dnl Checks for compilers.
+ dnl ========================================================
+ dnl Set CROSS_COMPILE in the environment when running configure
+--- ./toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-06-07 11:06:38.269792499 +0000
++++ ./toolkit/components/osfile/osfile_unix_allthreads.jsm	2013-06-07 11:09:36.714870364 +0000
+@@ -39,7 +39,8 @@
+ 
+   // Open libc
+   let libc;
+-  let libc_candidates =  [ "libSystem.B.dylib",
++  let libc_candidates =  [ OS.Constants.Path.libcFilename,
++                           "libSystem.B.dylib",
+                            "libc.so.6",
+                            "libc.so" ];
+   for (let i = 0; i < libc_candidates.length; ++i) {
+--- ./dom/system/OSFileConstants.cpp.orig	2013-06-07 11:48:56.341786916 +0000
++++ ./dom/system/OSFileConstants.cpp	2013-06-07 11:53:13.181079983 +0000
+@@ -756,6 +753,10 @@
+     return false;
+   }
+ 
++  if (!SetStringProperty(cx, objPath, "libcFilename", NS_LITERAL_STRING(MOZ_LIBC_FILENAME))) {
++    return false;
++  }
++
+   // Configure profileDir only if it is available at this stage
+   if (!gPaths->profileDir.IsVoid()
+     && !SetStringProperty(cx, objPath, "profileDir", gPaths->profileDir)) {