This version builds a working package with and without NaCl

1 files changed, 52 insertions, 29 deletions

diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild
index 25aa8d9a..2f8cf9a7 100755
--- a/chromium-dev/build/chromium.SlackBuild
+++ b/chromium-dev/build/chromium.SlackBuild
@@ -50,7 +50,11 @@ BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
-DOCS="LICENSE README*"
+# You can build without NaCl (native client) if you set USE_NACL to "0",
+# but you'll lose some Chrome functionality:
+USE_NACL=${USE_NACL:-1}
+
+DOCS="AUTHORS LICENSE README*"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -92,17 +96,19 @@ fi
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
 SRCURL[0]="https://commondatastorage.googleapis.com/${PRGNAM}-browser-official/${PRGNAM}-${VERSION}.tar.xz"
 
-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"
+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 --- ##
@@ -226,16 +232,21 @@ chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
 
-# 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
+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
+fi
 
 export -n LDFLAGS="$SLKLDFLAGS"
 export -n CXXFLAGS="$SLKCFLAGS"
@@ -255,7 +266,6 @@ _chromium_conf=(
     -Dffmpeg_branding=Chrome
     -Dproprietary_codecs=1
     -Ddisable_glibc=1
-    -Ddisable_nacl=1
     -Duse_gconf=0
     -Duse_kerberos=0
     -Duse_pulseaudio=0
@@ -278,6 +288,7 @@ _chromium_conf=(
     -Duse_system_zlib=0
     -Drelease_extra_cflags="$CFLAGS"
     -Dtarget_arch=${TARGETARCH}
+    -Ddisable_nacl=${DNACL}
     -Ddisable_sse2=${DSSE}
 )
     #-Dlinux_link_gsettings=1
@@ -300,22 +311,34 @@ install -D out/Release/chrome $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chromium
 install -D -m4755 -o root -g root out/Release/chrome_sandbox \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/chrome-sandbox
 
-# Native Client files:
+# Copy over the binaries:
 cp -a \
-  out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
-  out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+  out/Release/{*.pak,libffmpegsumo.so} \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
+if [ ${USE_NACL} -eq 1 ]; then
+  # Native Client files:
+  cp -a \
+    out/Release/nacl_helper{,_bootstrap} \
+    out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
+fi
 
 # Manually strip binaries so that 'nacl_irt_*.nexe' is left intact
 strip  --strip-unneeded \
   $PKG/usr/lib${LIBDIRSUFFIX}/chromium/{chromium,chrome-sandbox} \
-  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/nacl_helper{,_bootstrap} \
-  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libffmpegsumo.so \
-  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libppGoogleNaClPluginChrome.so
+  $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libffmpegsumo.so
+if [ ${USE_NACL} -eq 1 ]; then
+  strip  --strip-unneeded \
+    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/nacl_helper{,_bootstrap} \
+    $PKG/usr/lib${LIBDIRSUFFIX}/chromium/libppGoogleNaClPluginChrome.so
+fi
 
 # Add locales:
 cp -a out/Release/locales $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
 
+# Add resource files:
+cp -a out/Release/resources $PKG/usr/lib${LIBDIRSUFFIX}/chromium/
+
 # Install a man page:
 install -D -m0644 out/Release/chrome.1 $PKG/usr/man/man1/chromium.1