summaryrefslogtreecommitdiffstats
path: root/kde/KDE.options
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-12-22 01:02:13 +0100
committer Eric Hameleers <alien@slackware.com>2017-12-22 01:02:13 +0100
commit86e4ef9e64cb6abbb4d1ae3a6e67eb57fc2d9bac (patch)
tree82d0975b5e5feca9c6fb4447ab44f42a209ab932 /kde/KDE.options
parent2f43bf852b596696bb0fbc7e25ac1e92f7d253cf (diff)
downloadktown-86e4ef9e64cb6abbb4d1ae3a6e67eb57fc2d9bac.tar.gz
ktown-86e4ef9e64cb6abbb4d1ae3a6e67eb57fc2d9bac.tar.xz
Adapt the KDE.SlackBuild framework for a KDE4-less future
Diffstat (limited to 'kde/KDE.options')
-rw-r--r--kde/KDE.options25
1 files changed, 10 insertions, 15 deletions
diff --git a/kde/KDE.options b/kde/KDE.options
index 74dc6c0..1125561 100644
--- a/kde/KDE.options
+++ b/kde/KDE.options
@@ -1,21 +1,17 @@
-# Set default version/arch/build. You can override these settings
-# in the SlackBuild scripts for each package (koffice, for example,
-# usually has a different version number), or by setting your own
-# environment variables.
+# Set default arch/build. A default version is not needed since
+# package versions are determined by their source tarvall.
-[ -z $VERSION ] && export VERSION=5.11.3
[ -z $BUILD ] && export BUILD=1
# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
- case "$MARCH" in
- i?86) export ARCH=i486 ;;
- armv7hl) export ARCH=$MARCH ;;
- arm*) export ARCH=arm ;;
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
# Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$MARCH ;;
+ *) ARCH=$(uname -m) ;;
esac
+ export ARCH
fi
[ -z $PKGARCH ] && export PKGARCH=$ARCH
@@ -25,6 +21,9 @@ if [ -z "$SLKCFLAGS" ]; then
if [ "$ARCH" = "i486" ]; then
export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
export LIBDIRSUFFIX=""
+ elif [ "$ARCH" = "i586" ]; then
+ export SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ export LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
export SLKCFLAGS="-O2"
export LIBDIRSUFFIX=""
@@ -46,9 +45,6 @@ if [ -z "$SLKCFLAGS" ]; then
fi
fi
-# For KF5 beta builds (not co-installable with KDE4):
-export SLKCFLAGS="-I/opt/kf5/include $SLKCFLAGS"
-
# Use this to set the number of parallel make jobs:
if [ -z "$NUMJOBS" ]; then
export NUMJOBS="-j7"
@@ -56,6 +52,5 @@ fi
# Additional cmake flags that are spanned across the KDE modules
# Do not use "final build" unless we build an actual release.
-#export KDE_OPT_ARGS=" -DKDE4_ENABLE_FINAL=\"ON\" -DSITE=\"slackware.com\" "
export KDE_OPT_ARGS=" -Wno-dev -DBUILD_TESTING=OFF -DKDE4_BUILD_TESTS=OFF -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" "