summaryrefslogtreecommitdiffstats
path: root/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch')
-rw-r--r--package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch91
1 files changed, 0 insertions, 91 deletions
diff --git a/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch b/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch
deleted file mode 100644
index 40810b23ea..0000000000
--- a/package/util-linux/0002-build-sys-cleanup-UL_NCURSES_CHECK.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 862326451184bb0fe9c2b2b110fcfc986f9b1734 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 13 Dec 2016 12:41:18 +0100
-Subject: [PATCH] build-sys: cleanup UL_NCURSES_CHECK
-
-* use SUFFIX for upper-case suffix
-* use AC_CHECK_TOOL() to search for ncurses-config (thanks to Mike Frysinger)
-* separate checks by AS_IF()
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- m4/ul.m4 | 54 +++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 33 insertions(+), 21 deletions(-)
-
-diff --git a/m4/ul.m4 b/m4/ul.m4
-index 44c721e..f8a0dd7 100644
---- a/m4/ul.m4
-+++ b/m4/ul.m4
-@@ -438,36 +438,48 @@ dnl The expected <name> is ncurses or ncursesw.
- dnl
- AC_DEFUN([UL_NCURSES_CHECK], [
- m4_define([suffix], $1)
-- m4_define([suffixup], m4_toupper($1))
-+ m4_define([SUFFIX], m4_toupper($1))
-
-- # pkg-config
-- PKG_CHECK_MODULES(suffixup, [$1], [
-+ # pkg-config (not supported by ncurses upstream by default)
-+ #
-+ PKG_CHECK_MODULES(SUFFIX, [$1], [
- have_[]suffix=yes
-- NCURSES_LIBS=${suffixup[]_LIBS}
-- NCURSES_CFLAGS=${suffixup[]_CFLAGS}
-+ NCURSES_LIBS=${SUFFIX[]_LIBS}
-+ NCURSES_CFLAGS=${SUFFIX[]_CFLAGS}
- ],[have_[]suffix=no])
-
-- # ncurses-config should be everywhere, pkg-config is not supported by default
-- # by ncurses upstream
-+ # ncurses6-config
- #
- AS_IF([test "x$have_[]suffix" = xno], [
-- AC_MSG_CHECKING([$1 config])
-- if AC_RUN_LOG([suffix[]6-config --version >/dev/null]); then
-+ AC_CHECK_TOOL(SUFFIX[]6_CONFIG, suffix[]6-config)
-+ if AC_RUN_LOG([$SUFFIX[]6_CONFIG --version >/dev/null]); then
- have_[]suffix=yes
-- NCURSES_LIBS=`suffix[]6-config --libs`
-- NCURSES_CFLAGS=`suffix[]6-config --cflags`
-- AC_MSG_RESULT([(v6) yes])
-- elif AC_RUN_LOG([suffix[]5-config --version >/dev/null]); then
-+ NCURSES_LIBS=`$SUFFIX[]6_CONFIG --libs`
-+ NCURSES_CFLAGS=`$SUFFIX[]6_CONFIG --cflags`
-+ else
-+ have_[]suffix=no
-+ fi
-+ ])
-+
-+ # ncurses5-config
-+ #
-+ AS_IF([test "x$have_[]suffix" = xno], [
-+ AC_CHECK_TOOL(SUFFIX[]5_CONFIG, suffix[]5-config)
-+ if AC_RUN_LOG([$SUFFIX[]5_CONFIG --version >/dev/null]); then
- have_[]suffix=yes
-- NCURSES_LIBS=`suffix[]5-config --libs`
-- NCURSES_CFLAGS=`suffix[]5-config --cflags`
-- AC_MSG_RESULT([(v5) yes])
-+ NCURSES_LIBS=`$SUFFIX[]5_CONFIG --libs`
-+ NCURSES_CFLAGS=`$SUFFIX[]5_CONFIG --cflags`
- else
-- AC_MSG_RESULT([no])
-- AS_IF([test "x$have_[]suffix" = xno], [
-- AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no])
-- AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"])
-- ])
-+ have_[]suffix=no
- fi
- ])
-+
-+ # classic autoconf way
-+ #
-+ AS_IF([test "x$have_[]suffix" = xno], [
-+ AS_IF([test "x$have_[]suffix" = xno], [
-+ AC_CHECK_LIB([$1], [initscr], [have_[]suffix=yes], [have_[]suffix=no])
-+ AS_IF([test "x$have_[]suffix" = xyes], [NCURSES_LIBS="-l[]suffix"])
-+ ])
-+ ])
- ])
---
-2.6.2
-
OpenPOWER on IntegriCloud