diff options
author | B. Watson <yalhcru@gmail.com> | 2022-02-10 03:21:24 -0500 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-12 00:29:39 +0700 |
commit | a13b6a8c9e8a44828b136c801baf5c5a0ac98b5a (patch) | |
tree | c9a923db65f501e84156829ec8e31a3235557cdb /system/roxterm | |
parent | 1af3a9ecce380c9502664ea4f4d3d5fbfc7a1af1 (diff) |
system/roxterm: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/roxterm')
-rw-r--r-- | system/roxterm/roxterm.SlackBuild | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/system/roxterm/roxterm.SlackBuild b/system/roxterm/roxterm.SlackBuild index c3bf11e11867..87e2d1265744 100644 --- a/system/roxterm/roxterm.SlackBuild +++ b/system/roxterm/roxterm.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220210 bkw: Modified by SlackBuilds.org to fix the build on 15.0. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=roxterm @@ -30,9 +32,6 @@ BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -44,14 +43,14 @@ OUTPUT=${OUTPUT:-/tmp} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -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" @@ -75,11 +74,11 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -export CFLAGS="$SLKCFLAGS -g -Wall -I. -I${CWD} -D_GNU_SOURCE -DHAVE_CONFIG_H" +export CFLAGS="$SLKCFLAGS -fcommon -g -Wall -I. -I${CWD} -D_GNU_SOURCE -DHAVE_CONFIG_H" export LIBS="-L/usr/lib${LIBDIRSUFFIX}" export MAITCHFLAGS="CFLAGS=$CFLAGS;LIBS=$LIBS" |