projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: scripts/config - update to kconfig-v5.14
[openwrt/staging/dedeckeh.git]
/
scripts
/
config
/
qconf-cfg.sh
diff --git
a/scripts/config/qconf-cfg.sh
b/scripts/config/qconf-cfg.sh
index ebbc7ab4756b45ec68ff37d8d9abca849540da65..609bb818e8fec250fdb060c7551974c5020851b5 100755
(executable)
--- a/
scripts/config/qconf-cfg.sh
+++ b/
scripts/config/qconf-cfg.sh
@@
-2,7
+2,6
@@
# SPDX-License-Identifier: GPL-2.0-only
PKG="Qt5Core Qt5Gui Qt5Widgets"
# SPDX-License-Identifier: GPL-2.0-only
PKG="Qt5Core Qt5Gui Qt5Widgets"
-PKG2="QtCore QtGui"
if [ -z "$(command -v pkg-config)" ]; then
echo >&2 "*"
if [ -z "$(command -v pkg-config)" ]; then
echo >&2 "*"
@@
-12,21
+11,14
@@
if [ -z "$(command -v pkg-config)" ]; then
fi
if pkg-config --exists $PKG; then
fi
if pkg-config --exists $PKG; then
- echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags
Qt5Core Qt5Gui Qt5Widgets
)\"
+ echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags
$PKG
)\"
echo libs=\"$(pkg-config --libs $PKG)\"
echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
exit 0
fi
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 "*"
-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 "* Could not find Qt
5
via pkg-config."
+echo >&2 "* Please install
Qt5
and make sure it's in PKG_CONFIG_PATH"
echo >&2 "*"
exit 1
echo >&2 "*"
exit 1