summaryrefslogtreecommitdiffstats
path: root/chromium-dev
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-11-22 13:21:26 +0000
committer Eric Hameleers <alien@slackware.com>2013-11-22 13:21:26 +0000
commit4ad178a29e656d41cc0d4e2da6e612b881b57dd6 (patch)
tree8244538f510be26182f425d9d7df3727d25caa9c /chromium-dev
parent36e99288593f0b5894940f902bbf6aae6f403927 (diff)
downloadasb-4ad178a29e656d41cc0d4e2da6e612b881b57dd6.tar.gz
asb-4ad178a29e656d41cc0d4e2da6e612b881b57dd6.tar.xz
Clean-ups. The 32-bit and 64-bit packages both work, incl NaCl.
Diffstat (limited to 'chromium-dev')
-rwxr-xr-xchromium-dev/build/chromium.SlackBuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium-dev/build/chromium.SlackBuild b/chromium-dev/build/chromium.SlackBuild
index 2f8cf9a7..24b0fe23 100755
--- a/chromium-dev/build/chromium.SlackBuild
+++ b/chromium-dev/build/chromium.SlackBuild
@@ -21,7 +21,6 @@
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# Build procedure is based on Arch Linux PKGBUILD and SlackBuild.Org script.
# -----------------------------------------------------------------------------
#
# Slackware SlackBuild script
@@ -30,7 +29,8 @@
# For: chromium
# Descr: Open Source version of Chrome Web Browser
# URL: http://www.chromium.org/
-# Build needs: multilib (for the Native Client)
+# Build needs: multilib gcc & glibc for compiling the Native Client (64-bit)
+# libelf with '-D_FILE_OFFSET_BITS=64' added to CFLAGS (32-bit)
# Needs:
# Changelog:
# 31.0.1650.57-1:
@@ -51,7 +51,7 @@ NUMJOBS=${NUMJOBS:" -j4 "}
TAG=${TAG:-alien}
# You can build without NaCl (native client) if you set USE_NACL to "0",
-# but you'll lose some Chrome functionality:
+# but you'll lose some Chrome functionality like using in-browser applications:
USE_NACL=${USE_NACL:-1}
DOCS="AUTHORS LICENSE README*"
@@ -88,7 +88,7 @@ No values were defined for the following variables:
_google_default_client_id
_google_default_client_secret
Please supply your own Google API keys for Chromium!
-Press Ctrl-C to continue or wait 10 seconds...
+Press Ctrl-C to abort this script or wait 10 seconds to continue anyway.
EOT
sleep 10
fi
@@ -219,8 +219,9 @@ echo "Extracting the source archive(s) for $PRGNAM..."
tar -xf ${SOURCE[0]}
cd ${PRGNAM}-${VERSION}
+# Patches:
touch $OUTPUT/patch-${PRGNAM}.log
-# Fix build with system ICU (patch from Gentoo)
+# Fix build with system ICU:
cat $SRCDIR/patches/chromium-system-icu-r0.patch | patch -Np0 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
# Adapt for Slackware's libelf include file location:
@@ -311,7 +312,7 @@ 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
-# Copy over the binaries:
+# Copy over the remaining binaries:
cp -a \
out/Release/{*.pak,libffmpegsumo.so} \
$PKG/usr/lib${LIBDIRSUFFIX}/chromium/