diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-03-04 01:39:54 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-03-04 08:59:31 +0100 |
| commit | 05aafc282ba7bbef7d888d761c2d42341745bf50 (patch) | |
| tree | 2b1222c91afa0939efe151439457cc754effccb2 /source/xap | |
| parent | 11403357f20e37f8613bb0ea1cdc51c34c51f8a6 (diff) | |
| download | current-05aafc282ba7bbef7d888d761c2d42341745bf50.tar.gz current-05aafc282ba7bbef7d888d761c2d42341745bf50.tar.xz | |
Wed Mar 4 01:39:54 UTC 202020200304013954
xap/seamonkey-2.53.1-x86_64-2.txz: Rebuilt.
Fixed $LIBDIRSUFFIX for 32-bit. Thanks to ljb643.
Diffstat (limited to 'source/xap')
| -rwxr-xr-x | source/xap/seamonkey/seamonkey.SlackBuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 6f3dc56e0..817221bf6 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=seamonkey TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)} # Strip the end from beta versions: VERSION=$(echo $TARBALLVER | cut -f 1 -d b) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -46,6 +46,16 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +# Seamonkey has been requiring more and more memory, especially while linking +# libxul. If it fails to build natively on x86 32-bit, it can be useful to +# attempt the build using an x86_64 kernel and a 32-bit userspace. Detect this +# situation and set the ARCH to i686. Later in the script we'll add some +# options to the .mozconfig so that the compile will do the right thing. +if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then + COMPILE_X86_UNDER_X86_64=true + ARCH=i686 +fi + if [ "$ARCH" = "i686" ]; then LIBDIRSUFFIX="" OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} @@ -57,16 +67,6 @@ else OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} fi -# Seamonkey has been requiring more and more memory, especially while linking -# libxul. If it fails to build natively on x86 32-bit, it can be useful to -# attempt the build using an x86_64 kernel and a 32-bit userspace. Detect this -# situation and set the ARCH to i686. Later in the script we'll add some -# options to the .mozconfig so that the compile will do the right thing. -if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then - COMPILE_X86_UNDER_X86_64=true - ARCH=i686 -fi - # Choose a compiler (gcc/g++ or clang/clang++): export CC=${CC:-clang} export CXX=${CXX:-clang++} |