From b4e6e6e31f84ee6ea40e72d8ea6948892b2ac4e0 Mon Sep 17 00:00:00 2001 From: V'yacheslav Stetskevych Date: Thu, 6 Jan 2011 15:45:52 -0200 Subject: [PATCH] system/shake: Fix use of SLKCFLAGS. Signed-off-by: Niels Horn --- system/shake/shake.SlackBuild | 29 ++++++++++++++++++++++------- system/shake/shake.info | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/system/shake/shake.SlackBuild b/system/shake/shake.SlackBuild index ca9639fada..2d6802cacd 100644 --- a/system/shake/shake.SlackBuild +++ b/system/shake/shake.SlackBuild @@ -2,19 +2,35 @@ # Slackware build script for shake -# Written by V'yacheslav Stetskevych +# Copyright 2010 V'yacheslav Stetskevych +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=shake VERSION=${VERSION:-0.99} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -54,14 +70,13 @@ find . \ -exec chmod 644 {} \; cd build +CFLAGS="$SLKCFLAGS" \ cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ .. -make +make VERBOSE=1 make install DESTDIR=$PKG cd - diff --git a/system/shake/shake.info b/system/shake/shake.info index 0ac2aba208..8b8216efb0 100644 --- a/system/shake/shake.info +++ b/system/shake/shake.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="V'yacheslav Stetskevych" EMAIL="slava18@gmail.com" -APPROVED="dsomero" +APPROVED="dsomero,Niels Horn"