diff options
Diffstat (limited to 'source/xap')
-rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 21 | ||||
-rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 27 |
2 files changed, 24 insertions, 24 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index b589706f3..41d273f59 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-firefox VERSION=$(basename $(ls firefox-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b | cut -f 1 -d e) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Specify this variable for a localized build. # For example, to build a version of Firefox with Italian support, run @@ -135,25 +135,25 @@ export RUSTFLAGS="-Cdebuginfo=0" PGO=${PGO:-no} if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -g0" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -g0" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2 -g0" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -g0 -fPIC" + SLKCFLAGS="-g0 -fPIC" LIBDIRSUFFIX="64" elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -g0 -march=armv4 -mtune=xscale" + SLKCFLAGS="-g0 -march=armv4 -mtune=xscale" LIBDIRSUFFIX="" elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -g0 -march=armv4t" + SLKCFLAGS="-g0 -march=armv4t" LIBDIRSUFFIX="" else - SLKCFLAGS="-O2 -g0" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" fi @@ -240,6 +240,8 @@ OPTIONS="\ --enable-application=browser \ --enable-default-toolkit=cairo-gtk3-wayland \ --enable-linker=$LINKER \ + --enable-optimize \ + --enable-rust-simd \ $GOOGLE_API_KEY \ --disable-strip \ --disable-install-strip \ @@ -249,8 +251,7 @@ OPTIONS="\ --disable-debug-symbols \ --disable-debug \ --disable-elf-hack \ - --disable-updater \ - --disable-optimize" + --disable-updater" # Complains about missing APNG support in Slackware's libpng: # --with-system-png \ # This option breaks mozilla-12.0: diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index e81df3bdc..58667bf8c 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Specify this variable for a localized build. # For example, to build a version of Thunderbird with Italian support, run @@ -92,25 +92,26 @@ if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32- fi if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" - OPTIMIZE=${OPTIMIZE:-"-O2 -g0"} elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="" + SLKCFLAGS="-g0" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-g0" LIBDIRSUFFIX="" - OPTIMIZE=${OPTIMIZE:-"-O2 -g0"} elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-fPIC" + SLKCFLAGS="-g0 -fPIC" LIBDIRSUFFIX="64" - OPTIMIZE=${OPTIMIZE:-"-O2 -g0"} elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-march=armv4 -mtune=xscale" + SLKCFLAGS="-g0 -march=armv4 -mtune=xscale" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "armel" ]; then + SLKCFLAGS="-g0 -march=armv4t" LIBDIRSUFFIX="" - OPTIMIZE=${OPTIMIZE:-"-O2 -g0"} else - SLKCFLAGS="" + SLKCFLAGS="-g0" LIBDIRSUFFIX="" - OPTIMIZE=${OPTIMIZE:-"-O2 -g0"} fi # Choose a compiler (gcc/g++ or clang/clang++): @@ -222,6 +223,7 @@ OPTIONS="\ --disable-install-strip \ --enable-cpp-rtti \ --enable-accessibility \ + --enable-optimize \ $GOOGLE_API_KEY \ --disable-crashreporter \ --disable-debug-symbols \ @@ -272,9 +274,6 @@ echo "mk_add_options MOZ_OBJDIR=$(pwd)/obj" >> .mozconfig # This directory is also needed or the build will fail: mkdir -p mozilla/obj -# Set options for $OPTIMIZE: -echo "ac_add_options --enable-optimize=\"${OPTIMIZE}\"" >> .mozconfig - if [ "$COMPILE_X86_UNDER_X86_64" = "true" ]; then # Compile for i686 under an x86_64 kernel: echo "ac_add_options --host=i686-pc-linux-gnu" >> .mozconfig |