diff options
Diffstat (limited to 'extra/google-chrome')
| -rw-r--r-- | extra/google-chrome/README | 7 | ||||
| -rwxr-xr-x | extra/google-chrome/google-chrome.SlackBuild | 8 |
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 ;; |