summaryrefslogtreecommitdiffstats
path: root/extra/google-chrome
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2012-09-26 01:10:42 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 22:51:55 +0200
commit9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch)
treeb428a16618e36ed864a8d76ea3435e19a452bf90 /extra/google-chrome
parent75a4a592e5ccda30715f93563d741b83e0dcf39e (diff)
downloadcurrent-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz
current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.xz
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
Diffstat (limited to 'extra/google-chrome')
-rw-r--r--extra/google-chrome/README7
-rwxr-xr-xextra/google-chrome/google-chrome.SlackBuild8
2 files changed, 8 insertions, 7 deletions
diff --git a/extra/google-chrome/README b/extra/google-chrome/README
index cf64c7b85..36be68d67 100644
--- a/extra/google-chrome/README
+++ b/extra/google-chrome/README
@@ -39,12 +39,7 @@ cd /tmp
upgradepkg --install-new google-chrome-10.0.648.151-x86_64-1.txz
-Finally, please note that Google Chrome requires the GConf and ORBit2
-packages found in this directory in order to run. Be careful with these
-as they may create unintended dependencies on GConf/ORBit2 in other
-software that you compile on machines where they are installed.
-
-Newer beta and unstable builds may also require the PAM library libpam.so.0.
+Finally, please note that Google Chrome requires the PAM library libpam.so.0.
Installing the google-chrome-pam-solibs package in this directory will
allow these newer versions of Chrome to run without having to actually
switch the system to using PAM. If you need real PAM (to compile Chromium
diff --git a/extra/google-chrome/google-chrome.SlackBuild b/extra/google-chrome/google-chrome.SlackBuild
index 16179d2a6..de4c0b6f6 100755
--- a/extra/google-chrome/google-chrome.SlackBuild
+++ b/extra/google-chrome/google-chrome.SlackBuild
@@ -24,7 +24,13 @@
PKGNAM=google-chrome
RELEASE=${RELEASE:-stable} # stable, beta, or unstable
-case "$(uname -m)" in
+
+# Allow $ARCH to be preset before running the script. This is useful in the
+# case where someone is running a 32-bit chroot environment under an x86_64
+# kernel:
+ARCH=${ARCH:-$(uname -m)}
+
+case "$ARCH" in
i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;;
x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
*) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;