summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew White <mehw.is.me@inventati.org>2021-05-10 00:05:49 +0000
committerJoonas Niilola <juippis@gentoo.org>2021-06-03 10:01:11 +0300
commitcd2fe787cf93eaa7e82564b901993447273e8367 (patch)
treeb2e8d0fdcc5818424f086db5cadd41faec883aaa /net-wireless
parentnet-misc/clockspeed: Fix license (diff)
downloadgentoo-cd2fe787cf93eaa7e82564b901993447273e8367.tar.gz
gentoo-cd2fe787cf93eaa7e82564b901993447273e8367.tar.bz2
gentoo-cd2fe787cf93eaa7e82564b901993447273e8367.zip
net-wireless/wavemon-0.9.3: fix ncurses(w) libs
Fixes a segmentation fault due to linking with libncursesw and libtinfo, rather than libtinfow. See also https://github.com/uoaerg/wavemon/issues/88 about the segmentation fault error. If libncursesw is available uses ncursesw_LIBS, otherwise uses ncurses_LIBS if libncurses remains the only option. Closes: https://bugs.gentoo.org/785562 Signed-off-by: Matteo Bianco <mehw.is.me@inventati.org> Closes: https://github.com/gentoo/gentoo/pull/20749 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wavemon/files/wavemon-0.9.3-build.patch19
1 files changed, 11 insertions, 8 deletions
diff --git a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
index 74b09271a0f2..7cc054efefa4 100644
--- a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
+++ b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
@@ -1,5 +1,5 @@
--- a/configure.ac 2020-12-26 17:44:01.616731241 +0100
-+++ b/configure.ac 2020-12-26 17:45:02.447292151 +0100
++++ b/configure.ac 2021-05-09 21:57:37.000000000 +0000
@@ -8,8 +8,6 @@
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_FILES([Makefile])
@@ -18,14 +18,17 @@
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
-@@ -29,6 +31,7 @@
- net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- [], [AC_MSG_ERROR($ac_header not found)])
- AC_CHECK_HEADERS([ncursesw/curses.h])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+@@ -54,8 +54,8 @@
+ # Tests involving libraries
+ AC_CHECK_LIB([m], [pow], [], [AC_MSG_ERROR(math library not found)])
+ AC_CHECK_LIB([ncursesw], [waddstr],
+- [],
+- [AC_CHECK_LIB([ncurses], [waddstr], [], [AC_MSG_ERROR(ncurses library not found)])])
++ [PKG_CHECK_MODULES([ncursesw], [ncursesw], [LIBS="$LIBS $ncursesw_LIBS"], [])],
++ [AC_CHECK_LIB([ncurses], [waddstr], [PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], [])], [AC_MSG_ERROR(ncurses library not found)])])
+ AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"],
+ [AC_MSG_ERROR(pthread library not found)])
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
--- a/Makefile.in 2017-07-14 21:35:18.154423280 +0300
+++ b/Makefile.in 2017-07-14 21:35:34.613402738 +0300
@@ -9,7 +9,7 @@