diff options
| author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
| commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
| tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-gnome/recipes-gnome/libxklavier | |
| parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
| download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz | |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome/libxklavier')
| -rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch | 36 | ||||
| -rw-r--r-- | meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb | 35 |
2 files changed, 71 insertions, 0 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch new file mode 100644 index 000000000..29eeef3d5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch @@ -0,0 +1,36 @@ +From 2343283caf88d2390afee08fe034b4c970b20f2e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 16 Apr 2016 06:40:04 -0400 +Subject: [PATCH] fix do_installe failure + +| 18 /usr/bin/install -c -m 644 ../../libxklavier-5.4/libxklavier/libxklavier.vapi +libxklavier.deps 'tmp/work/corei7-64-wrs-linux/libxklavier/5.4-r0/image/ +usr/share/vala/vapi' +| 19 /usr/bin/install: cannot stat '../../libxklavier-5.4/libxklavier/ +libxklavier.vapi': No such file or directory +| 20 Makefile:621: recipe for target 'install-vapiDATA' failed +| 21 make[3]: *** [install-vapiDATA] Error 1 +| 22 make[3]: *** Waiting for unfinished jobs.... + +Upstream-Stauts: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + libxklavier/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am +index c9c1bbe..f0efa32 100644 +--- a/libxklavier/Makefile.am ++++ b/libxklavier/Makefile.am +@@ -131,6 +131,6 @@ libxklavier.deps: + done + + vapidir = $(datadir)/vala/vapi +-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) ++vapi_DATA = $(VAPIGEN_VAPIS:.vapi=.deps) + endif + endif +-- +1.9.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb new file mode 100644 index 000000000..2ef54f212 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "Helper lib for keyboard management" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" + +DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" + +inherit autotools pkgconfig gettext gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS_${PN} += "iso-codes xkbcomp" + +SRC_URI = " \ + http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \ + file://fix-do_installe-failure.patch \ +" +SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" +SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" + +FILES_${PN} += "${datadir}/*" + +EXTRA_OECONF = "--with-xkb-bin-base=${bindir}" + +do_configure_append() { + find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + libxklavier.pc +} + + |