diff options
Diffstat (limited to 'development/qbs/qbs.SlackBuild')
| -rw-r--r-- | development/qbs/qbs.SlackBuild | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/development/qbs/qbs.SlackBuild b/development/qbs/qbs.SlackBuild index 38a44ef913ce7..4d5372c1a68a4 100644 --- a/development/qbs/qbs.SlackBuild +++ b/development/qbs/qbs.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qbs -VERSION=${VERSION:-1.5.1} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -54,6 +54,12 @@ else LIBDIRSUFFIX="" fi +if [ -r /usr/bin/qbs ]; then + echo "The qbs package needs to be removed before building" + echo "in order to have a successful build" + exit 1 +fi + set -e rm -rf $PKG @@ -72,7 +78,7 @@ find -L . \ # Adjust docs location. sed -i "s|share/doc/qbs|doc/qbs-$VERSION|g" doc/doc.pri -qmake-qt5 qbs.pro \ +qmake-qt5 -r qbs.pro \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ QBS_INSTALL_PREFIX=/usr \ QBS_LIBRARY_DIRNAME=lib$LIBDIRSUFFIX \ |