summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-04-08 14:39:28 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-04-08 14:39:28 +0200
commitc00425ee6e741ecb382bf71a10979b1c1a9d68f4 (patch)
tree02b939781dea2ae4c19256d7402126902e7ab0d0 /net-p2p/ncdc/files
parentnet-p2p/ncdc: Bumped live ebuild to EAPI-7 (diff)
downloadgentoo-c00425ee6e741ecb382bf71a10979b1c1a9d68f4.tar.gz
gentoo-c00425ee6e741ecb382bf71a10979b1c1a9d68f4.tar.bz2
gentoo-c00425ee6e741ecb382bf71a10979b1c1a9d68f4.zip
net-p2p/ncdc: Bump to version 1.21
Fixed compilation against sys-libs/ncurses[tinfo] Closes: https://bugs.gentoo.org/677820 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-p2p/ncdc/files')
-rw-r--r--net-p2p/ncdc/files/ncdc-1.21-tinfo.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
new file mode 100644
index 000000000000..0e5acac59d50
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
@@ -0,0 +1,53 @@
+From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 8 Apr 2019 13:58:42 +0200
+Subject: [PATCH] Fix build against ncurses with separate libtinfo
+
+by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c774316..d0c0430 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
+ # Check for header files.
+ AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
+
+-have_nch=no
+-AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
+-if test "x$have_nch" = "xno"; then
+- AC_MSG_ERROR([Could not find a header files for ncurses.])
+-fi
+-
+
+ # Check for posix_fadvise()
+ AC_CHECK_FUNCS([posix_fadvise])
+@@ -95,15 +89,11 @@ esac
+
+
+ # Check for ncurses
+-AC_CHECK_LIB([ncursesw], [get_wch], [
+- AC_SUBST([NCURSES_LIBS],[-lncursesw])
+- ], [
+- AC_CHECK_LIB([ncurses],
+- [get_wch],
+- [AC_SUBST([NCURSES_LIBS],[-lncurses])],
+- [AC_MSG_ERROR(ncursesw library is required)])
+- ]
+-)
++PKG_CHECK_MODULES(NCURSES, ncursesw,,[
++ PKG_CHECK_MODULES(NCURSES, ncurses,,[
++ AC_MSG_ERROR(ncurses library is required)
++ ])
++])
+
+ # Check for zlib
+ AC_CHECK_LIB([z],
+--
+2.21.0
+