diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-27 23:05:26 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 10:49:26 +0200 |
commit | 9dc60fe10fe812eb4d722d81351c74ec598cb114 (patch) | |
tree | aa2544f28a1e8af088ab92e8cbb9cbb490e9436e | |
parent | d6fe20e6083d421cc6091892e1d302c46e2d075d (diff) | |
download | meta-qt5-9dc60fe10fe812eb4d722d81351c74ec598cb114.tar.gz |
recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF
* this fixes builds for DISTROs which include no-static-libraries.inc
* this change depends on oe-core change:
http://patchwork.openembedded.org/patch/116719/
which was merged in this form:
http://patchwork.openembedded.org/patch/120513/
to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core
you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsystems_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 35d922e4..0bdfde57 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -82,7 +82,7 @@ QT_CONFIG_FLAGS += " \ | |||
82 | -no-pch \ | 82 | -no-pch \ |
83 | -no-rpath \ | 83 | -no-rpath \ |
84 | -pkg-config \ | 84 | -pkg-config \ |
85 | ${EXTRA_OECONF} \ | 85 | ${PACKAGECONFIG_CONFARGS} \ |
86 | " | 86 | " |
87 | 87 | ||
88 | # qtbase is exception, as these are used as install path for sysroots | 88 | # qtbase is exception, as these are used as install path for sysroots |
@@ -201,7 +201,7 @@ do_configure() { | |||
201 | -xplatform linux-oe-g++ \ | 201 | -xplatform linux-oe-g++ \ |
202 | ${QT_CONFIG_FLAGS} | 202 | ${QT_CONFIG_FLAGS} |
203 | 203 | ||
204 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 204 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" |
205 | } | 205 | } |
206 | 206 | ||
207 | do_install() { | 207 | do_install() { |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a19422b6..af8fe4da 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -20,7 +20,7 @@ PACKAGECONFIG_class-native ??= "tools-only" | |||
20 | PACKAGECONFIG_class-nativesdk ??= "tools-only" | 20 | PACKAGECONFIG_class-nativesdk ??= "tools-only" |
21 | PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | 21 | PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" |
22 | 22 | ||
23 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | 23 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
24 | 24 | ||
25 | FILES_${PN}-qmlplugins += " \ | 25 | FILES_${PN}-qmlplugins += " \ |
26 | ${OE_QMAKE_PATH_QML}/*/*/*.bez \ | 26 | ${OE_QMAKE_PATH_QML}/*/*/*.bez \ |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 057edd40..9f3b0152 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -40,7 +40,7 @@ do_generate_qt_config_file() { | |||
40 | : | 40 | : |
41 | } | 41 | } |
42 | 42 | ||
43 | EXTRA_OECONF = " \ | 43 | PACKAGECONFIG_CONFARGS = " \ |
44 | -prefix ${prefix} \ | 44 | -prefix ${prefix} \ |
45 | -sysroot ${STAGING_DIR_NATIVE} \ | 45 | -sysroot ${STAGING_DIR_NATIVE} \ |
46 | -no-gcc-sysroot \ | 46 | -no-gcc-sysroot \ |
@@ -90,8 +90,8 @@ export OE_QMAKE_AR | |||
90 | export OE_QMAKE_STRIP | 90 | export OE_QMAKE_STRIP |
91 | 91 | ||
92 | do_configure_prepend() { | 92 | do_configure_prepend() { |
93 | MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 93 | MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" |
94 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 94 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}" |
95 | } | 95 | } |
96 | 96 | ||
97 | do_install() { | 97 | do_install() { |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bf56741f..98f63786 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -135,7 +135,7 @@ QT_CONFIG_FLAGS += " \ | |||
135 | -no-pch \ | 135 | -no-pch \ |
136 | -no-rpath \ | 136 | -no-rpath \ |
137 | -pkg-config \ | 137 | -pkg-config \ |
138 | ${EXTRA_OECONF} \ | 138 | ${PACKAGECONFIG_CONFARGS} \ |
139 | " | 139 | " |
140 | 140 | ||
141 | do_generate_qt_config_file_append() { | 141 | do_generate_qt_config_file_append() { |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index cf6d3c51..17bd169f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -18,7 +18,7 @@ inherit bluetooth | |||
18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" | 18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" |
19 | PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" | 19 | PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" |
20 | 20 | ||
21 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | 21 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
22 | 22 | ||
23 | do_configure_prepend() { | 23 | do_configure_prepend() { |
24 | # disable bluez test if it isn't enabled by PACKAGECONFIG | 24 | # disable bluez test if it isn't enabled by PACKAGECONFIG |
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 868e051d..656895ef 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb | |||
@@ -16,7 +16,7 @@ inherit bluetooth | |||
16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" | 16 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" |
17 | PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" | 17 | PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" |
18 | 18 | ||
19 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | 19 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
20 | 20 | ||
21 | do_configure_prepend() { | 21 | do_configure_prepend() { |
22 | # disable bluez test if it isn't enabled by PACKAGECONFIG | 22 | # disable bluez test if it isn't enabled by PACKAGECONFIG |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 8f5276f1..c0451747 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -40,7 +40,7 @@ PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" | |||
40 | PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" | 40 | PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" |
41 | PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" | 41 | PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" |
42 | 42 | ||
43 | EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" | 43 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
44 | 44 | ||
45 | COMPATIBLE_MACHINE = "(-)" | 45 | COMPATIBLE_MACHINE = "(-)" |
46 | COMPATIBLE_MACHINE_x86 = "(.*)" | 46 | COMPATIBLE_MACHINE_x86 = "(.*)" |
@@ -75,7 +75,7 @@ do_configure() { | |||
75 | export CC_host="gcc" | 75 | export CC_host="gcc" |
76 | export CXX_host="g++" | 76 | export CXX_host="g++" |
77 | export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" | 77 | export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" |
78 | export QMAKE_CACHE_EVAL="${EXTRA_OECONF}" | 78 | export QMAKE_CACHE_EVAL="${PACKAGECONFIG_CONFARGS}" |
79 | 79 | ||
80 | # Disable autodetection from sysroot: | 80 | # Disable autodetection from sysroot: |
81 | sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf | 81 | sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/g; s/packagesExist(minizip, zlib):/false:/g; s/packagesExist(libwebp,libwebpdemux):/false:/g; s/packagesExist(libxml-2.0,libxslt):/false:/g; s/^ *packagesExist($$package):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 04cefada..4e61cca7 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -35,7 +35,7 @@ PACKAGECONFIG[qtwebchannel] = "OE_QTWEBCHANNEL_ENABLED,,qtwebchannel" | |||
35 | PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" | 35 | PACKAGECONFIG[libwebp] = "OE_LIBWEBP_ENABLED,,libwebp" |
36 | 36 | ||
37 | do_configure_prepend() { | 37 | do_configure_prepend() { |
38 | export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" | 38 | export QMAKE_CACHE_EVAL="CONFIG+=${PACKAGECONFIG_CONFARGS}" |
39 | # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG | 39 | # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG |
40 | sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf | 40 | sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf |
41 | # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG | 41 | # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG |