From 4c10c70ad1be629687d717021fc21817d929475d Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 13 Apr 2013 15:58:52 +0200
Subject: Make requirement of adding '-ltinfo' to LDFLAGS independent of ARCH.

The ARM port split libtinfo off libncursesw to allow for smaller binaries.
However this requires the addition of '-ltinfo' to some linker commands,
since modern binutils require explicit linking of all used libraries (DSO).
In order to make this geneally applicable, not just for ARCH=armv7hl, I
made a few changes in SlackBuild scripts.
---
 source.local/a/gptfdisk/gptfdisk.SlackBuild     | 2 +-
 source.local/a/util-linux/util-linux.SlackBuild | 2 +-
 source.local/ap/htop/htop.SlackBuild            | 6 ++++--
 source.local/ap/powertop/powertop.SlackBuild    | 5 ++++-
 source.local/d/cmake/cmake.SlackBuild           | 2 +-
 source.local/d/gdb/gdb.SlackBuild               | 2 +-
 source.local/l/libcdio/libcdio.SlackBuild       | 6 ++++--
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/source.local/a/gptfdisk/gptfdisk.SlackBuild b/source.local/a/gptfdisk/gptfdisk.SlackBuild
index 2277729..b31269c 100755
--- a/source.local/a/gptfdisk/gptfdisk.SlackBuild
+++ b/source.local/a/gptfdisk/gptfdisk.SlackBuild
@@ -86,7 +86,7 @@ find . \
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
-if [ "$ARCH" = "armv7hl" ]; then
+if ncursesw5-config  --libs |grep -q tinfo ; then
   export LDFLAGS="-ltinfo $LDFLAGS"
 fi
 
diff --git a/source.local/a/util-linux/util-linux.SlackBuild b/source.local/a/util-linux/util-linux.SlackBuild
index 7a779e1..e153211 100755
--- a/source.local/a/util-linux/util-linux.SlackBuild
+++ b/source.local/a/util-linux/util-linux.SlackBuild
@@ -109,7 +109,7 @@ zcat $CWD/0002-fdisk-don-t-ignore-1MiB-granularity-on-512-byte-sect.patch.gz | p
 # 20120814 bkw: fix "column --separator <anything>" segfault
 zcat $CWD/column-fix_long_opts.diff.gz | patch -p1 --verbose || exit 1
 
-if [ "$ARCH" = "armv7hl" ]; then
+if ncursesw5-config  --libs |grep -q tinfo ; then
   export LDFLAGS="-ltinfo $LDFLAGS"
 fi
 
diff --git a/source.local/ap/htop/htop.SlackBuild b/source.local/ap/htop/htop.SlackBuild
index 76f82c2..5a8fec1 100755
--- a/source.local/ap/htop/htop.SlackBuild
+++ b/source.local/ap/htop/htop.SlackBuild
@@ -82,8 +82,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-LDFLAGS="-ltinfo" \
+if ncursesw5-config  --libs |grep -q tinfo ; then
+  export LDFLAGS="-ltinfo $LDFLAGS"
+fi
+export CFLAGS="$SLKCFLAGS"
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
diff --git a/source.local/ap/powertop/powertop.SlackBuild b/source.local/ap/powertop/powertop.SlackBuild
index e11ed85..0c52e5a 100755
--- a/source.local/ap/powertop/powertop.SlackBuild
+++ b/source.local/ap/powertop/powertop.SlackBuild
@@ -81,7 +81,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-LDFLAGS=" -ltinfo -lresolv -lz " \
+export LDFLAGS=" -lresolv -lz "
+if ncursesw5-config  --libs |grep -q tinfo ; then
+  export LDFLAGS=" -ltinfo $LDFLAGS"
+fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source.local/d/cmake/cmake.SlackBuild b/source.local/d/cmake/cmake.SlackBuild
index 27b74f5..bb99e30 100755
--- a/source.local/d/cmake/cmake.SlackBuild
+++ b/source.local/d/cmake/cmake.SlackBuild
@@ -88,7 +88,7 @@ else
   WITH_QTGUI=" "
 fi
 
-if [ "$ARCH" = "armv7hl" ]; then
+if ncursesw5-config  --libs |grep -q tinfo ; then
   export LDFLAGS="-ltinfo $LDFLAGS"
 fi
 
diff --git a/source.local/d/gdb/gdb.SlackBuild b/source.local/d/gdb/gdb.SlackBuild
index a99c760..980db52 100755
--- a/source.local/d/gdb/gdb.SlackBuild
+++ b/source.local/d/gdb/gdb.SlackBuild
@@ -70,7 +70,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-if [ "$ARCH" = "armv7hl" ]; then
+if ncursesw5-config  --libs |grep -q tinfo ; then
   export LDFLAGS="-ltinfo $LDFLAGS"
 fi
 
diff --git a/source.local/l/libcdio/libcdio.SlackBuild b/source.local/l/libcdio/libcdio.SlackBuild
index 3cabb85..eb61b09 100755
--- a/source.local/l/libcdio/libcdio.SlackBuild
+++ b/source.local/l/libcdio/libcdio.SlackBuild
@@ -83,8 +83,10 @@ find . \
   -exec chmod 644 {} \;
 
 # Configure:
-CFLAGS="$SLKCFLAGS" \
-LDFLAGS="-ltinfo" \
+if ncursesw5-config  --libs |grep -q tinfo ; then
+  export LDFLAGS="-ltinfo"
+fi
+export CFLAGS="$SLKCFLAGS"
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-- 
cgit v1.2.3