[meta-oe][PATCH 1/4] llvm2.9: add LLVM_EXTRA_ARCH to enable X86 unless building for x86

[meta-oe][PATCH 1/4] llvm2.9: add LLVM_EXTRA_ARCH to enable X86 unless building for x86

[Martin Jansa]

* now I see why it was there before, at least on arm it fails with:
  | CMake Error at cmake/modules/LLVMConfig.cmake:127 (message):
  |   Library `X86' not found in list of llvm libraries.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/llvm/llvm2.9_2.9.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-core/llvm/llvm2.9_2.9.bb b/meta-oe/recipes-core/llvm/llvm2.9_2.9.bb
index 04195d9..2b46162 100644
--- a/meta-oe/recipes-core/llvm/llvm2.9_2.9.bb
+++ b/meta-oe/recipes-core/llvm/llvm2.9_2.9.bb
@@ -17,9 +17,13 @@ SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch "
 
 PARALLEL_MAKE_virtclass-native = ""
 
+LLVM_EXTRA_ARCH = "X86;"
+LLVM_EXTRA_ARCH_x86 = ""
+LLVM_EXTRA_ARCH_x86-64 = ""
+
 EXTRA_OECMAKE = "\
     -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \
-    -DLLVM_TARGETS_TO_BUILD="${LLVM_ARCH}" \
+    -DLLVM_TARGETS_TO_BUILD="${LLVM_EXTRA_ARCH}${LLVM_ARCH}" \
     -DCMAKE_LINKER:FILEPATH=${LD} \
     -DCMAKE_AR:FILEPATH=${AR} \
     -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \
-- 
1.8.2.1

[meta-oe][PATCH 2/4] compat-wireless: exclude from world

[Martin Jansa]

* depends on config options which are not enabled in qemu* MACHINEs by default

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc b/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc
index 41f673a..3981426 100644
--- a/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc
+++ b/meta-oe/recipes-kernel/compat-wireless/compat-wireless.inc
@@ -6,6 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d7810fab7487fb0aad327b76f1be7cd7"
 RDEPENDS_${PN} = "wireless-tools"
 INC_PR = "r1"
 
+# depends on config options which are not enabled in qemu* MACHINEs by default
+# config.mk:25: *** "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.".  Stop.
+EXCLUDE_FROM_WORLD = "1"
+
 COMPAT_WIRELESS_VERSION = "${PV}-1"
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
 
-- 
1.8.2.1

[meta-oe][PATCH 3/4] libnotify3, nautilus3: exclude from world

[Martin Jansa]

* libnotify3 conflicts with libnotify and breaks couple of gnome recipes

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb | 3 +++
 meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
index 4c46ec4..fb9752f 100644
--- a/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
+++ b/meta-gnome/recipes-gnome/libnotify/libnotify3_0.7.3.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 DEPENDS = "dbus gtk+3"
 
+# conflicts with libnotify, mixing them in build breaks couple of packages
+EXCLUDE_FROM_WORLD = "1"
+
 BPN = "libnotify"
 
 inherit gnome lib_package
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
index a9dcaf4..1acf8d3 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb
@@ -11,6 +11,9 @@ PR = "r4"
 DEPENDS = "libnotify3 gtk+3 libunique gvfs librsvg libexif gnome-desktop3"
 # optional: tracker
 
+# needs libnotify3 which conflicts with libnotify, mixing them in build breaks couple of packages
+EXCLUDE_FROM_WORLD = "1"
+
 # to include nautilus3/no-try-run-strftime.diff before the rest
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 BPN = "nautilus"
-- 
1.8.2.1

[meta-oe][PATCH 4/4] meta-multimedia/README: add dependency on meta-ruby

[Martin Jansa]

* mkvtoolnix depends on ruby-native
---
 meta-multimedia/README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-multimedia/README b/meta-multimedia/README
index 7bf7fc8..3562a29 100644
--- a/meta-multimedia/README
+++ b/meta-multimedia/README
@@ -4,7 +4,8 @@ URI: git://git.openembedded.org/openembedded-core
 branch: master
 revision: HEAD
 
-URI: git://git.openembedded.org/meta-openembedded/meta-oe
+URI: git://git.openembedded.org/meta-openembedded
+layers: meta-oe, meta-ruby
 branch: master
 revision: HEAD
 
-- 
1.8.2.1