From d78af11f72d263d0c8bab8d3aafb34fc0984564a Mon Sep 17 00:00:00 2001 From: Idwer Vollering Date: Wed, 28 Jul 2021 20:15:29 +0200 Subject: util/kconfig: detect ncurses on FreeBSD Even though pkg-config might be installed, it might or will not return true in the checks whether 'PKG' or 'PKG2' is installed. Extend the script to look in another location for ncurses.h Signed-off-by: Idwer Vollering Change-Id: I4344ba2116c0b8618357db4248d993509cbb666e Reviewed-on: https://review.coreboot.org/c/coreboot/+/56677 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Martin Roth --- ...13-util-kconfig-detect-ncurses-on-FreeBSD.patch | 31 ++++++++++++++++++++++ util/kconfig/patches/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch (limited to 'util/kconfig/patches') diff --git a/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch b/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch new file mode 100644 index 0000000000..8442349941 --- /dev/null +++ b/util/kconfig/patches/0013-util-kconfig-detect-ncurses-on-FreeBSD.patch @@ -0,0 +1,31 @@ +From 8512ae9b9bd83f6051f63b0673903283788a2d12 Mon Sep 17 00:00:00 2001 +From: Idwer Vollering +Date: Wed, 28 Jul 2021 20:15:29 +0200 +Subject: [PATCH] util/kconfig: detect ncurses on FreeBSD + +Signed-off-by: Idwer Vollering +Change-Id: I4344ba2116c0b8618357db4248d993509cbb666e +--- + util/kconfig/mconf-cfg.sh | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/util/kconfig/mconf-cfg.sh b/util/kconfig/mconf-cfg.sh +index b520e407a8..2047e626b4 100755 +--- a/util/kconfig/mconf-cfg.sh ++++ b/util/kconfig/mconf-cfg.sh +@@ -33,6 +33,12 @@ if [ -f /usr/include/ncurses/ncurses.h ]; then + exit 0 + fi + ++# We'll want to be able to build on (Free)BSD: ++if [ -f /usr/include/ncurses.h ]; then ++ echo libs=\"-lncurses\" ++ exit 0 ++fi ++ + # As a final fallback before giving up, check if $HOSTCC knows of a default + # ncurses installation (e.g. from a vendor-specific sysroot). + if echo '#include ' | ${HOSTCC} -E - >/dev/null 2>&1; then +-- +2.31.1 + diff --git a/util/kconfig/patches/series b/util/kconfig/patches/series index 8497f16728..dfc614ec58 100644 --- a/util/kconfig/patches/series +++ b/util/kconfig/patches/series @@ -10,3 +10,4 @@ 0010-reenable-source-in-choice.patch 0011-remove-include-config-hardcodes.patch 0012-safer-tmpfiles.patch +0013-util-kconfig-detect-ncurses-on-FreeBSD.patch -- cgit v1.2.3