Skip to contentSkip to conversation

luajit: Fix mips build with clang

PATCH New Khem Raj 1 participant 2 messages Sep 20, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 luajit: Fix mips build with clang

Signed-off-by Khem Raj <[email protected]>
---
 meta-oe/recipes-devtools/luajit/luajit/clang.patch | 19 +++++++++++++++++++
 meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb    |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/luajit/luajit/clang.patch
meta-oe/recipes-devtools/luajit/luajit/clang.patch new file +19 -0
new file mode 100644
index 000000000..c39ef6fd4
@@ -0,0 +1,19 @@
+clang pretends to be gcc 4.2.0 which is a big lie when it comes
+to features, its same as latest gcc
+
+Signed-off-by: Khem Raj <[email protected]>
+Upstream-Status: Pending
+
+Index: LuaJIT-2.0.5/src/lj_arch.h
+===================================================================
+--- LuaJIT-2.0.5.orig/src/lj_arch.h
++++ LuaJIT-2.0.5/src/lj_arch.h
+@@ -313,7 +313,7 @@
+ #error "Need at least GCC 4.2 or newer"
+ #endif
+ #elif !LJ_TARGET_PS3
+-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
++#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3) && !defined(__clang__)
+ #error "Need at least GCC 4.3 or newer"
+ #endif
+ #endif
meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +1 -0
index d7477ed98..73c38111e 100644
@@ -5,6 +5,7 @@ HOMEPAGE = "http://luajit.org"
 
 SRC_URI = "http://luajit.org/download/LuaJIT-${PV}.tar.gz \
            file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \
+           file://clang.patch \
 "
 SRC_URI[md5sum] = "48353202cbcacab84ee41a5a70ea0a2c"
 SRC_URI[sha256sum] = "874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979"
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 networkmanager: Disable gobject-introspection on musl

It segfaults qemu like below, until this is root caused we disable it

|
| (process:16378): GLib-CRITICAL **: g_hash_table_lookup: assertion 'hash_table != NULL' failed
| **
| GLib-GObject:ERROR:../../glib-2.52.3/gobject/gtype.c:2743:g_type_register_static: assertion failed: (static_quark_type_flags)
| /mnt/a/oe/build/tmp/work/aarch64-bec-linux-musl/networkmanager/1.4.4-r0/recipe-sysroot/usr/bin/g-ir-scanner-qemuwrapper: line 6: 16378 Aborted                 (core dumped) PSEUDO_UNLOAD=1 qemu-aarch64 -r 3.14 -L /mnt/a/oe/build/tmp/work/aarch64-bec-linux-musl/networkmanager/1.4.4-r0/recipe-sysroot -E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:/mnt/a/oe/build/tmp/work/aarch64-bec-linux-musl/networkmanager/1.4.4-r0/recipe-sysroot//usr/lib:/mnt/a/oe/build/tmp/work/aarch64-bec-linux-musl/networkmanager/1.4.4-r0/recipe-sysroot//lib "$@"
Signed-off-by Khem Raj <[email protected]>
---
 .../recipes-connectivity/networkmanager/networkmanager_1.4.4.bb         | 2 ++
 1 file changed, 2 insertions(+)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb +2 -0
index 8e7fe9feb..bfd2aada7 100644
@@ -24,6 +24,8 @@ DEPENDS = " \
 
 inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
 
+GI_DATA_ENABLED_libc-musl = "False"
+
 SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
            file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
            file://0002-Fix-nm-version-macro-includes.patch \
Signature · 1 line
2.14.1