aboutsummaryrefslogtreecommitdiff
path: root/development/slibtool/slibtool.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/slibtool/slibtool.SlackBuild')
-rw-r--r--development/slibtool/slibtool.SlackBuild22
1 files changed, 6 insertions, 16 deletions
diff --git a/development/slibtool/slibtool.SlackBuild b/development/slibtool/slibtool.SlackBuild
index db9512673ba89..2b690415d1319 100644
--- a/development/slibtool/slibtool.SlackBuild
+++ b/development/slibtool/slibtool.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=slibtool
-VERSION=${VERSION:-0.5.24}
+VERSION=${VERSION:-0.5.25}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -72,32 +72,22 @@ find -L . \
[ "${DEBUG:=0}" != 0 ] && \
SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0 -g/')"
-# Fix build with sandbox
-# https://bugs.gentoo.org/656184
-# slbt_adjust_linker_argument(): properly handle explicit .a/.so arguments.
-# slbt_adjust_linker_argument(): process dependencies also for non-pic .la args.
-# slbt_adjust_linker_argument(): properly handle external archives and libraries.
-# whitespace meditation.
-# link mode: properly handle explicit archive input arguments.
-# https://git.midipix.org/cgit.cgi/slibtool/commit/?id=6a1ae75038ff6d45ff3c7bbd4ef090798545e617
-# https://git.midipix.org/cgit.cgi/slibtool/commit/?id=2a0acb3d2d178cce84d511b727e1410ebb8dbce5
-# https://git.midipix.org/cgit.cgi/slibtool/commit/?id=ba8a741ee5b66da5a2d44c1c9b9f6eb6d54e0b18
-# https://git.midipix.org/cgit.cgi/slibtool/commit/?id=6185379aed8fab5a5d230e4a828258c6a5516743
-# https://git.midipix.org/cgit.cgi/slibtool/commit/?id=46aa6f554c0f2ef1affa5ae292fffec6907ff4b3
-zcat $CWD/sandbox.patch.gz | patch -p1
-
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-static \
--enable-shared \
- --pkgdurl='http://slackbuilds.org/apps/slibtool/' \
+ --pkgdurl='https://slackbuilds.org/apps/slibtool/' \
--build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
+# Due to changes introduced in 0.5.25 this symlink is required as a
+# temporary hack until slibtool no longer needs an external -ar.
+( cd $PKG/usr/bin; ln -s $ARCH-slackware-linux-gcc-ar $ARCH-slackware-linux-ar )
+
if [ "$DEBUG" = 0 ]; then
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true