diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-02-09 16:12:49 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-12 00:29:38 +0700 |
| commit | 31e06a369a04bd71dc7303c1855581615fc613e0 (patch) | |
| tree | a7a705f03c11de064568091ef444ba6dab902282 /system/twin/twin.SlackBuild | |
| parent | 78eb960edde8c378f100c10603919a11a5273c07 (diff) | |
system/twin: 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/twin/twin.SlackBuild')
| -rw-r--r-- | system/twin/twin.SlackBuild | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/system/twin/twin.SlackBuild b/system/twin/twin.SlackBuild index 0307c863604a7..89a6d3411fea0 100644 --- a/system/twin/twin.SlackBuild +++ b/system/twin/twin.SlackBuild @@ -23,6 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Slightly modified by Robby Workman <rworkman@slackbuilds.org> +# 20220209 bkw: ...and fixed for 15.0 by B. Watson. cd $(dirname $0) ; CWD=$(pwd) @@ -34,15 +35,12 @@ PKGTYPE=${PKGTYPE:-tgz} 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 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 @@ -52,8 +50,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" @@ -78,8 +76,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +SLKCFLAGS+=" -fcommon" + +# 20220209 bkw: configure ignores CFLAGS from environment. ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -88,7 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make -j1 +make -j1 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ |