diff options
Diffstat (limited to 'source/l/qt/qtwebkit/qtwebkit.SlackBuild')
| -rwxr-xr-x | source/l/qt/qtwebkit/qtwebkit.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/l/qt/qtwebkit/qtwebkit.SlackBuild b/source/l/qt/qtwebkit/qtwebkit.SlackBuild index 9524d836f..6ba9301f8 100755 --- a/source/l/qt/qtwebkit/qtwebkit.SlackBuild +++ b/source/l/qt/qtwebkit/qtwebkit.SlackBuild @@ -23,6 +23,8 @@ # # Derived from the main qt SlackBuild +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=qtwebkit VERSION=$(ls qtwebkit-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} @@ -42,30 +44,30 @@ if [ -z "$ARCH" ]; then fi if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="" WEBKITFLAGS="--no-force-sse2" elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="" WEBKITFLAGS="--no-force-sse2" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="" WEBKITFLAGS="--no-force-sse2" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="64" WEBKITFLAGS="" elif [ "$ARCH" = "armv7hl" ]; then # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" # More permanent solution is to patch gcc: # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="" WEBKITFLAGS="--no-force-sse2" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks" LIBDIRSUFFIX="" WEBKITFLAGS="--no-force-sse2" fi @@ -75,7 +77,6 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} |