build: scripts/config - update to kconfig-v6.6.16

[openwrt/staging/nbd.git] / scripts / config / mconf-cfg.sh

diff --git a/scripts/config/mconf-cfg.sh b/scripts/config/mconf-cfg.sh
index 35723692880e6bab170f0d9561dd8e8903c4276f..4e48cc1d57b8d79a380c3c813355f8d396585b84 100755 (executable)
--- a/scripts/config/mconf-cfg.sh
+++ b/scripts/config/mconf-cfg.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 
+cflags=$1
+libs=$2
+
 PKG="ncursesw"
 PKG2="ncurses"
 
-if [ -n "$(command -v pkg-config)" ]; then
-       if pkg-config --exists $PKG; then
-               echo cflags=\"$(pkg-config --cflags $PKG)\"
-               echo libs=\"$(pkg-config --libs $PKG)\"
+if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
+       if ${HOSTPKG_CONFIG} --exists $PKG; then
+               ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags}
+               ${HOSTPKG_CONFIG} --libs ${PKG} > ${libs}
                exit 0
        fi
 
-       if pkg-config --exists $PKG2; then
-               echo cflags=\"$(pkg-config --cflags $PKG2)\"
-               echo libs=\"$(pkg-config --libs $PKG2)\"
+       if ${HOSTPKG_CONFIG} --exists ${PKG2}; then
+               ${HOSTPKG_CONFIG} --cflags ${PKG2} > ${cflags}
+               ${HOSTPKG_CONFIG} --libs ${PKG2} > ${libs}
                exit 0
        fi
 fi
@@ -22,22 +25,22 @@ fi
 # (Even if it is installed, some distributions such as openSUSE cannot
 # find ncurses by pkg-config.)
 if [ -f /usr/include/ncursesw/ncurses.h ]; then
-       echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
-       echo libs=\"-lncursesw\"
+       echo -D_GNU_SOURCE -I/usr/include/ncursesw > ${cflags}
+       echo -lncursesw > ${libs}
        exit 0
 fi
 
 if [ -f /usr/include/ncurses/ncurses.h ]; then
-       echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
-       echo libs=\"-lncurses\"
+       echo -D_GNU_SOURCE -I/usr/include/ncurses > ${cflags}
+       echo -lncurses > ${libs}
        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 <ncurses.h>' | ${HOSTCC} -E - >/dev/null 2>&1; then
-       echo cflags=\"-D_GNU_SOURCE\"
-       echo libs=\"-lncurses\"
+       echo -D_GNU_SOURCE > ${cflags}
+       echo -lncurses > ${libs}
        exit 0
 fi
 
@@ -46,7 +49,7 @@ echo >&2 "* Unable to find the ncurses package."
 echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"
 echo >&2 "* depending on your distribution)."
 echo >&2 "*"
-echo >&2 "* You may also need to install pkg-config to find the"
+echo >&2 "* You may also need to install ${HOSTPKG_CONFIG} to find the"
 echo >&2 "* ncurses installed in a non-default location."
 echo >&2 "*"
 exit 1