From 899ac5afd82cf91c22f4dba223630ea52a9d8d15 Mon Sep 17 00:00:00 2001 From: Zhu Qun-Ying Date: Wed, 25 Jan 2017 08:55:18 +0700 Subject: libraries/libtelnet: Fix build. Signed-off-by: Willy Sudiarto Raharjo --- libraries/libtelnet/autoconf.patch | 18 ++++++++++++++++++ libraries/libtelnet/libtelnet.SlackBuild | 10 ++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 libraries/libtelnet/autoconf.patch (limited to 'libraries/libtelnet') diff --git a/libraries/libtelnet/autoconf.patch b/libraries/libtelnet/autoconf.patch new file mode 100644 index 0000000000..81df23d1a6 --- /dev/null +++ b/libraries/libtelnet/autoconf.patch @@ -0,0 +1,18 @@ +commit 76b4633f91b07d6319de5924d8ece4905f29646e +Author: Felipe Weckx +Date: Mon Jun 16 10:36:01 2014 -0300 + + compatibility with autoconf 2.6.x + +diff --git a/configure.ac b/configure.ac +index 7f5bb61..021b48f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([libtelnet.c]) + AM_INIT_AUTOMAKE([1.9 foreign -Wall -Werror subdir-objects]) ++AM_PROG_AR + #LT_INIT([win32-dll]) + AC_LIBTOOL_WIN32_DLL + diff --git a/libraries/libtelnet/libtelnet.SlackBuild b/libraries/libtelnet/libtelnet.SlackBuild index 40e10ec616..5cc9992706 100644 --- a/libraries/libtelnet/libtelnet.SlackBuild +++ b/libraries/libtelnet/libtelnet.SlackBuild @@ -29,7 +29,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,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" @@ -64,7 +64,9 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -autoreconf -fi +patch -p1 < $CWD/autoconf.patch +autoreconf -fis + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ -- cgit v1.2.3-65-gdbad