diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-06-26 21:33:38 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-06-26 21:33:38 +0000 |
| commit | 64eb85e0037ffe8b77b4d9b5a6459af8cbe45a48 (patch) | |
| tree | 50a2f5647703be3dd38a31ba561289bdc8216eaa | |
| parent | 8433749dc21564552b81133382fb4da653acdecc (diff) | |
| download | asb-64eb85e0037ffe8b77b4d9b5a6459af8cbe45a48.tar.gz asb-64eb85e0037ffe8b77b4d9b5a6459af8cbe45a48.tar.xz | |
lumina: updated to 1.3.0
| -rwxr-xr-x | lumina/build/lumina.SlackBuild | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lumina/build/lumina.SlackBuild b/lumina/build/lumina.SlackBuild index 58dbe704..0c08cac2 100755 --- a/lumina/build/lumina.SlackBuild +++ b/lumina/build/lumina.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2016 Eric Hameleers <alien@slackware.com> +# Copyright 2016, 2017 Eric Hameleers <alien@slackware.com> # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -37,6 +37,8 @@ # * Update. No more separate localizations. # 1.1.0.p1-2: 16/nov/2016 by Eric Hameleers <alien@slackware.com> # * Fix location of /etc/ directory. +# 1.3.0-1: 16/jun/2017 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh lumina.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -45,10 +47,10 @@ # ----------------------------------------------------------------------------- PRGNAM=lumina -SRCVER=${SRCVER:-"1.1.0"} -SRCPL=${SRCPL:-"-p1"} +SRCVER=${SRCVER:-"1.3.0"} +SRCPL=${SRCPL:-""} VERSION=$(echo ${SRCVER}${SRCPL} |tr '-' '.') -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j4 "} TAG=${TAG:-alien} @@ -79,7 +81,7 @@ else MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -88,7 +90,7 @@ else fi # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" @@ -164,11 +166,13 @@ chmod -R u+w,go+r-w,a+rX-st . cd ${PRGNAM}-${SRCVER}${SRCPL} +# The 'QMAKE_CFLAGS_ISYSTEM=' is a workaround for compiling with gcc7: echo Building ... qmake-qt5 \ PREFIX=/usr \ L_ETCDIR=/etc \ LIBPREFIX=/usr/lib${LIBDIRSUFFIX} \ + QMAKE_CFLAGS_ISYSTEM= \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ |