From 650b1fd83f7223df1563497684a00099c70cda5b Mon Sep 17 00:00:00 2001
From: Niels Horn
Date: Thu, 13 Sep 2012 17:02:50 -0300
Subject: system/sdltrs: Fixed to build against gcc-4.7

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 system/sdltrs/sdltrs.SlackBuild | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'system/sdltrs')

diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild
index 3b43f48d6f..6a85270302 100644
--- a/system/sdltrs/sdltrs.SlackBuild
+++ b/system/sdltrs/sdltrs.SlackBuild
@@ -3,12 +3,31 @@
 # Slackware build script for sdltrs:
 # the Radio Shack TRS-80 Model I/III/4/4p emulator
 
-# Written by Niels Horn - niels.horn@gmail.com
-# revision date 2010/07/10
+# Copyright 2009-2010, 2012 Niels Horn, Rio de Janeiro, Brazil
+# 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.
+
+# revision date 2012/08/09
 
 PRGNAM=sdltrs
 VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -38,10 +57,6 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
   ARCHQUADLET=""
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-  ARCHQUADLET="-gnueabi"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -58,6 +73,9 @@ cd ${PRGNAM}_$SRCVERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# include -lX11 in the Makefile (sw-14.0)
+sed "/^LIBS/s/= /= -lX11 /" -i src/linux/Makefile
+
 # the Makefile is in the src/linux directory
 make INCS="$SLKCFLAGS" -C src/linux
 
-- 
cgit v1.2.3