mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-15 18:27:12 +00:00
ibus: no need for -native recipe
We were building ibus-native for the unicode-parser tool that is needed
at build time. However, ibus can correctly build that (and other tools)
in cross-compiled environments since 1.5.29[1], so there's no need to
have a native recipe anymore.
[1] ibus 18f0d9f5 ("configure: Fix cross compiling")
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
8fa14064ef
commit
e5578313c7
2 files changed
-41
No files matched your search
@@ -1,35 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit native
|
||||
|
||||
DEPENDS += " \
|
||||
glib-2.0-native \
|
||||
dbus-native \
|
||||
iso-codes \
|
||||
"
|
||||
|
||||
PACKAGECONFIG = ""
|
||||
|
||||
# for allarch iso-codes
|
||||
EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig"
|
||||
# for allarch unicode-ucd - just to make configure happy
|
||||
EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd"
|
||||
|
||||
do_compile() {
|
||||
cd src
|
||||
# seems by moving to src we break dependency tracking so build what's
|
||||
# necessary step by step
|
||||
oe_runmake ibusenumtypes.h
|
||||
oe_runmake ibusmarshalers.h
|
||||
oe_runmake ibusresources.h
|
||||
oe_runmake ibusenumtypes.c
|
||||
oe_runmake unicode-parser
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}/${libdir}
|
||||
install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir}
|
||||
|
||||
install -d ${D}/${bindir}
|
||||
install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
glib-2.0-native \
|
||||
glib-2.0 \
|
||||
dbus \
|
||||
@@ -26,11 +25,6 @@ do_compile:prepend() {
|
||||
export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
|
||||
}
|
||||
|
||||
do_configure:prepend() {
|
||||
# run native unicode-parser
|
||||
sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
|
||||
}
|
||||
|
||||
FILES:${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/GConf \
|
||||
|
||||
Reference in new issue
Block a user