diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
5 files changed, 86 insertions, 3 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch new file mode 100644 index 000000000..6c87ff2a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/JS_PUBLIC_API.patch @@ -0,0 +1,37 @@ +Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1426865 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1426865] +--- a/js/public/TypeDecls.h ++++ b/js/public/TypeDecls.h +@@ -21,22 +21,23 @@ + #include <stdint.h> + + #include "js-config.h" ++#include "jstypes.h" + + struct JSContext; +-class JSFunction; ++class JS_PUBLIC_API(JSFunction); + class JSObject; +-class JSScript; +-class JSString; +-class JSAddonId; ++class JS_PUBLIC_API(JSScript); ++class JS_PUBLIC_API(JSString); ++class JS_PUBLIC_API(JSAddonId); + +-struct jsid; ++struct JS_PUBLIC_API(jsid); + + namespace JS { + + typedef unsigned char Latin1Char; + +-class Symbol; +-class Value; ++class JS_PUBLIC_API(Symbol); ++class JS_PUBLIC_API(Value); + template <typename T> class Handle; + template <typename T> class MutableHandle; + template <typename T> class Rooted; diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb index 0dfe2f848..7c8a7aee1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_52.9.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/m/mozjs52/mozjs52_52.9.1.o file://disable-mozglue-in-stand-alone-builds.patch \ file://add-riscv-support.patch \ file://0001-mozjs-fix-coredump-caused-by-getenv.patch \ + file://JS_PUBLIC_API.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ @@ -49,7 +50,7 @@ EXTRA_OECONF = " \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},,virtual/libx11" +PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" EXTRA_OEMAKE_task-compile += "OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 930c04123..737c13427 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -20,7 +20,9 @@ inherit cmake distutils3-base DEPENDS += "json-c" -EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON" +EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON \ + -DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \ + " # Prepend mraa-utils to make sure bindir ends up in there PACKAGES =+ "${PN}-utils" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch new file mode 100644 index 000000000..7351197e4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-Fix-build-on-big-endian-architectures.patch @@ -0,0 +1,41 @@ +From ff98a326d5faa585f0e15e51a558cc2c49aa8099 Mon Sep 17 00:00:00 2001 +From: Primoz Fiser <primoz.fiser@norik.com> +Date: Fri, 23 Nov 2018 08:31:29 +0100 +Subject: [PATCH] Fix build on big endian architectures + +Signed-off-by: Primoz Fiser <primoz.fiser@norik.com> +--- + Common/DtaEndianFixup.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Common/DtaEndianFixup.h b/Common/DtaEndianFixup.h +index 58eb3ff..184fce0 100644 +--- a/Common/DtaEndianFixup.h ++++ b/Common/DtaEndianFixup.h +@@ -31,12 +31,11 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + //TODO: add a test on the endianess of the system and define + // empty macros if the system is big endian + #pragma once +-#ifdef __gnu_linux__ +-#include <endian.h> +-#if __BYTE_ORDER != __LITTLE_ENDIAN +-#error This code does not support big endian architectures +-#endif +-#endif ++#if defined(__BYTE_ORDER__)&&(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) ++#define SWAP16(x) x ++#define SWAP32(x) x ++#define SWAP64(x) x ++#else + /** change the "endianess" of a 16bit field */ + #define SWAP16(x) ((uint16_t) ((x & 0x00ff) << 8) | ((x & 0xff00) >> 8)) + /** change the "endianess" of a 32bit field */ +@@ -47,3 +46,5 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + ((uint64_t) (SWAP32((x & 0x00000000ffffffff)) << 32) | \ + ((uint64_t) (SWAP32((x >> 32))) ) \ + ) ++ ++#endif +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index cec569f62..765618433 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae5 BASEPV = "1.15.1" PV = "${BASEPV}+git${SRCPV}" SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" -SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git" +SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ + file://0001-Fix-build-on-big-endian-architectures.patch \ +" S = "${WORKDIR}/git" |
