From 10da8a664927491aedc0374e444f754f82dab507 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 21 Jul 2014 22:10:28 +0000
Subject: Toolchain binaries can no longer be downloaded in advance

---
 chromium-dev/build/chromium.SlackBuild | 42 ++++++++--------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

(limited to 'chromium-dev')

diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild
index 59ff0a9a..7157642a 100755
--- a/chromium-dev/build/chromium.SlackBuild
+++ b/chromium-dev/build/chromium.SlackBuild
@@ -29,9 +29,10 @@
 # For:         chromium
 # Descr:       Open Source version of Chrome Web Browser
 # URL:         http://www.chromium.org/
-# Build needs: multilib gcc & glibc for compiling the Native Client (64-bit);
-#              libelf with '-D_FILE_OFFSET_BITS=64' added to CFLAGS (32-bit);
-#              ninja.
+# Build needs: - multilib gcc & glibc for compiling the Native Client (64-bit);
+#              - libelf with '-D_FILE_OFFSET_BITS=64' added to CFLAGS (32-bit);
+#              - ninja.
+#              - Internet access (for downloading the nacl/pnacl toolchain bins)
 # Needs:       
 # Changelog:   
 # 31.0.1650.57-1:
@@ -81,6 +82,8 @@
 # 36.0.1985.125-1:
 #              16/jun/2014 by Eric Hameleers <alien@slackware.com>
 #              * Update comes with several security fixes.
+#                We can no longer download the toolchain binaries in advance,
+#                so the build will now require internet connectivity.
 # 
 # Run 'sh chromium.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -94,10 +97,6 @@ BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
-# For an indication of what toolchain version to use, you can check the
-# PNACL_VERSION value in chromium's "native_client/TOOL_REVISIONS" file.
-TOOLREV=13104
-
 # You can build without NaCl (native client) if you set USE_NACL to "0",
 # but you'll lose some Chrome functionality like using in-browser applications:
 USE_NACL=${USE_NACL:-1}
@@ -151,20 +150,6 @@ fi
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
 SRCURL[0]="https://commondatastorage.googleapis.com/${PRGNAM}-browser-official/${PRGNAM}-${VERSION}.tar.xz"
 
-if [ ${USE_NACL} -eq 1 ]; then
-  SOURCE[1]="$SRCDIR/naclsdk_nacl_linux_x86-${TOOLREV}.tgz"
-  SRCURL[1]="https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/${TOOLREV}/naclsdk_linux_x86.tgz"
-  
-  SOURCE[2]="$SRCDIR/naclsdk_pnacl_linux_x86-${TOOLREV}.tgz"
-  SRCURL[2]="https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/${TOOLREV}/naclsdk_pnacl_linux_x86.tgz"
-  
-  SOURCE[3]="$SRCDIR/naclsdk_pnacl_translator-${TOOLREV}.tgz"
-  SRCURL[3]="https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/${TOOLREV}/naclsdk_pnacl_translator.tgz"
-  
-  SOURCE[4]="$SRCDIR/naclsdk_pnacl_translator-${TOOLREV}.tgz.sha1hash"
-  SRCURL[4]="https://commondatastorage.googleapis.com/nativeclient-archive2/toolchain/${TOOLREV}/naclsdk_pnacl_translator.tgz.sha1hash"
-fi
-
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
@@ -292,16 +277,6 @@ chmod -R u+w,go+r-w,a+X-s .
 echo Building ...
 
 if [ ${USE_NACL} -eq 1 ]; then
-  # Prepare Native Client (NaCL) toolchain:
-  mkdir -p native_client/toolchain/{.tars,pnacl_translator}
-  ln -s "$SRCDIR/naclsdk_nacl_linux_x86-${TOOLREV}.tgz" \
-    native_client/toolchain/.tars/naclsdk_linux_x86.tgz
-  ln -s "$SRCDIR/naclsdk_pnacl_linux_x86-${TOOLREV}.tgz" \
-    native_client/toolchain/.tars/naclsdk_pnacl_linux_x86.tgz
-  ln -s "$SRCDIR/naclsdk_pnacl_translator-${TOOLREV}.tgz" \
-    native_client/toolchain/.tars/naclsdk_pnacl_translator.tgz
-  ln -s "$SRCDIR/naclsdk_pnacl_translator-${TOOLREV}.tgz.sha1hash" \
-    native_client/toolchain/pnacl_translator/SOURCE_SHA1
   DNACL=0
 else
   DNACL=1
@@ -358,8 +333,11 @@ build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 build/gyp_chromium --depth=. "${_chromium_conf[@]}" \
   2>&1 | tee $OUTPUT/gyp-${PRGNAM}.log
-build/download_nacl_toolchains.py \
+if [ ${USE_NACL} -eq 1 ]; then
+  # We do not need arm_trusted on x86:
+  build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator \
   2>&1 | tee $OUTPUT/nacl_dl-${PRGNAM}.log
+fi
 
 ninja $NUMJOBS  -C out/Release chrome chrome_sandbox chromedriver
   2>&1 | tee $OUTPUT/ninja-${PRGNAM}.log
-- 
cgit v1.2.3