diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
| commit | c779e019ac53019baa07eb843aba59bc55ffec20 (patch) | |
| tree | f4dd959f71cea6ac6a8741a1a8f9933a389f5bc7 /kde/kde.options | |
| parent | e0d005c66dbed44be15070995d9d9e9200c989fa (diff) | |
| download | ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.gz ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.xz | |
Updated 'testing' in preparation for June '18 release of Plasma 5.13
Diffstat (limited to '')
| -rw-r--r-- | kde/kde.options (renamed from kde/KDE.options) | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/kde/KDE.options b/kde/kde.options index b484074..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.7.2 [ -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\" " |