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 /recipes-qt/qt5/qtbase-native_git.bb | |
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
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() { |