diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-04-12 00:09:52 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2020-04-12 00:10:47 +0200 |
| commit | 7b1d809a8d8620032553845cf4a8819a19508687 (patch) | |
| tree | e9c221f4cee621bbbfa2d02ac2870b0d3caaa4a4 /scripts/config/qconf-cfg.sh | |
| parent | 6c16d64b2a0bb063a89225dcaabd50c00bce7aa2 (diff) | |
| download | openwrt-7b1d809a8d8620032553845cf4a8819a19508687.tar.gz openwrt-7b1d809a8d8620032553845cf4a8819a19508687.tar.bz2 openwrt-7b1d809a8d8620032553845cf4a8819a19508687.zip | |
Revert "build: scripts/config - update to kconfig-v5.6"
This reverts commit dcf3e63a35d05e7e5103819c0f17195bfafe9baa.
The kconfig update requires further testing and refinement until it can
remain in tree. Main problems are:
- Recursive deps are now fatal instead of a warning
- Previously legal syntax now leads to hard failures
- It fails all package builds since multiple days
The updated kconfig implementation needs to cope with the current status
quo in the various package feeds before we can reconsider it for master.
It is not desirable that single broken packages can hard-fail the entire
build pipeline.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'scripts/config/qconf-cfg.sh')
| -rwxr-xr-x | scripts/config/qconf-cfg.sh | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/scripts/config/qconf-cfg.sh b/scripts/config/qconf-cfg.sh deleted file mode 100755 index 02ccc0ae10..0000000000 --- a/scripts/config/qconf-cfg.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -PKG="Qt5Core Qt5Gui Qt5Widgets" -PKG2="QtCore QtGui" - -if [ -z "$(command -v pkg-config)" ]; then - echo >&2 "*" - echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it." - echo >&2 "*" - exit 1 -fi - -if pkg-config --exists $PKG; then - echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\" - echo libs=\"$(pkg-config --libs $PKG)\" - echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\" - exit 0 -fi - -if pkg-config --exists $PKG2; then - echo cflags=\"$(pkg-config --cflags $PKG2)\" - echo libs=\"$(pkg-config --libs $PKG2)\" - echo moc=\"$(pkg-config --variable=moc_location QtCore)\" - exit 0 -fi - -echo >&2 "*" -echo >&2 "* Could not find Qt via pkg-config." -echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH" -echo >&2 "*" -exit 1 |