mongodb: Pass computed endian variable
PATCH 1/2 mongodb: Pass computed endian variable
If not passed to SCon, it will try to guess it
and do it by poking at build host, which wont
work in cross environment
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-support/mongodb/mongodb_git.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-support/mongodb/mongodb_git.bb +1 -0
@@ -58,6 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ --use-system-zlib \ --js-engine=none \ --nostrip \ + --endian='${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}' \ ${PACKAGECONFIG_CONFARGS} \ mongod mongos"
Signature · 1 line
2.14.1
PATCH 2/2 rcmd: Fix build with musl
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 2 + ...ne-__THROW-to-avoid-build-issue-with-musl.patch | 47 ++++++++++++++++++++++ .../0002-Do-not-use-rcmd-on-build-with-musl.patch | 31 ++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch create mode 100644 meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch
meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +2 -0
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8" SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch \ file://0001-genisoimage-Fix-fprintf-format-errors.patch \ + file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ + file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ " SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da"
meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch new file +47 -0
47 lines not on this page · raw message
meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 510838b2c96a9b097b3ee2694cba1c3623b0bac7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 21 Sep 2017 22:38:05 -0700 +Subject: [PATCH 2/2] Do not use rcmd on build with musl + +cdrkit unconditionally enables code using rcmd(3), which isn't available +on musl. + +Signed-off-by: Khem Raj <[email protected]> +--- + include/xconfig.h.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/xconfig.h.in b/include/xconfig.h.in +index 476c00b..6b4b298 100644 +--- a/include/xconfig.h.in ++++ b/include/xconfig.h.in +@@ -186,8 +186,9 @@ + * Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure + * they are placed before the large file tests. + */ +- ++#ifdef __GLIBC__ + #define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ ++#endif + #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ + #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ + #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ +-- +2.14.1 +
Signature · 1 line
2.14.1
Quoted 14 lines · Khem Raj
If not passed to SCon, it will try to guess it
and do it by poking at build host, which wont
work in cross environmentSigned-off-by Khem Raj <[email protected]>--- meta-oe/recipes-support/mongodb/mongodb_git.bb | 1 + 1 file changed, 1 insertion(+)meta-oe/recipes-support/mongodb/mongodb_git.bb +0
-0
meta-oe/recipes-support/mongodb/mongodb_git.bb EXTRA_OESCONS = "--prefix=${D}${prefix} \ · line 61
Quoted 4 lines
meta-oe/recipes-support/mongodb/mongodb_git.bb +1
-0@@ -58,6 +58,7 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ --use-system-zlib \ --js-engine=none \ --nostrip \ + --endian='${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'big', 'little', d)}' \
Does checking TUNE_FEATURES work for all architectures? Or only architectures which can be both big and little endian?
Maybe checking SITEINFO_ENDIANNESS would be more reliable.
Quoted 11 lines
meta-oe/recipes-support/mongodb/mongodb_git.bb +0
-1${PACKAGECONFIG_CONFARGS} \ mongod mongos" --2.14.1
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel