diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-04-17 12:59:44 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-04-17 13:02:43 +0000 |
| commit | 4a300b5cb81ed88555bcd44d09b0cf50cc734598 (patch) | |
| tree | 632cb2974be9c92f0d11e5f97eaea35e9207215e /main/xulrunner/moz-libc-filename.patch | |
| parent | 1d8737f8e21eca4bc92df4be80848b67da3c3c2a (diff) | |
| download | aports-4a300b5cb81ed88555bcd44d09b0cf50cc734598.tar.bz2 aports-4a300b5cb81ed88555bcd44d09b0cf50cc734598.tar.xz | |
main/xulrunner: upgrade to 28.0
ref #2522
Diffstat (limited to 'main/xulrunner/moz-libc-filename.patch')
| -rw-r--r-- | main/xulrunner/moz-libc-filename.patch | 52 |
1 files changed, 12 insertions, 40 deletions
diff --git a/main/xulrunner/moz-libc-filename.patch b/main/xulrunner/moz-libc-filename.patch index 3e0e0fc3bf..166d03f3c0 100644 --- a/main/xulrunner/moz-libc-filename.patch +++ b/main/xulrunner/moz-libc-filename.patch @@ -1,41 +1,13 @@ ---- ./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) +--- ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2014-04-03 13:38:04.304500945 +0000 ++++ ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm 2014-04-03 13:41:51.910587459 +0000 +@@ -40,8 +40,8 @@ - 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/modules/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)) { + // Open libc + let libc; +-let libc_candidates = [ "libSystem.B.dylib", +- "libc.so.6", ++let libc_candidates = [ "a.out", ++ "libSystem.B.dylib", + "libc.so" ]; + for (let i = 0; i < libc_candidates.length; ++i) { + try { |