[arch-commits] Commit in firefox/trunk (PKGBUILD mozconfig)

[Jan Steffens]

    Date: Tuesday, September 17, 2013 @ 18:31:46
  Author: heftig
Revision: 194531

fix i686 build

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig

-----------+
 PKGBUILD  |   24 +++++++++++++-----------
 mozconfig |    1 -
 2 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-17 15:27:34 UTC (rev 194530)
+++ PKGBUILD	2013-09-17 16:31:46 UTC (rev 194531)
@@ -26,7 +26,7 @@
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch
         firefox-20.0.1-fixed-loading-icon.png)
 sha256sums=('86a6efa501e1b106b597a8506757f3a2db9d3a5cfcc61ea29a9ad0c834bea83b'
-            '2d7d1b909ebb22e6108532d3aded0d0010f785cf23044d4a98c276bb3be047ff'
+            'ad0e3c2916076774a8f3b66b8d515a4b1403a2bc789215b5180892537283e4ac'
             'd2a7610393ba259c35e3227b92e02ec91095a95189f56ac93ccdf6732772719c'
             'ded67e8204bd5e1c0c5771c0d2c84ff80c998e1543711e7cd804cfe29e8dd1b0'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
@@ -51,6 +51,7 @@
     browser/base/Makefile.in
 
   echo -n "$_google_api_key" >google-api-key
+  echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
 
   mkdir "$srcdir/path"
 
@@ -73,22 +74,23 @@
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
   export PYTHON="/usr/bin/python2"
-  export GOOGLE_API_KEYFILE="$PWD/google-api-key"
 
-  # Work around memory address space exhaustion during linking on i686
   if [[ $CARCH == i686 ]]; then
+    # Work around memory address space exhaustion during linking on i686
     LDFLAGS+=' -Wl,--no-keep-memory'
-  fi
+    make -f client.mk build
+  else
+    # Set up PGO
+    export DISPLAY=:99
+    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
 
-  export DISPLAY=:99
-  Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+    if ! make -f client.mk build MOZ_PGO=1; then
+      kill $!
+      return 1
+    fi
 
-  if ! make -f client.mk build MOZ_PGO=1; then
-    kill $!
-    return 1
+    kill $! || true
   fi
-
-  kill $! || true
 }
 
 package() {

Modified: mozconfig
===================================================================
--- mozconfig	2013-09-17 15:27:34 UTC (rev 194530)
+++ mozconfig	2013-09-17 16:31:46 UTC (rev 194531)
@@ -4,7 +4,6 @@
 ac_add_options --libdir=/usr/lib
 
 ac_add_options --enable-official-branding
-ac_add_options --with-google-api-keyfile="$GOOGLE_API_KEYFILE"
 
 # System libraries
 ac_add_options --with-system-nspr