mongodb: Remove non building arches from COMPATIBLE_HOST
PATCH 1/2 mongodb: Remove non building arches from COMPATIBLE_HOST
c++17 is default now so we don't need to edit out c++11 options
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
meta-oe/recipes-dbs/mongodb/mongodb_git.bb +1 -9
@@ -36,11 +36,7 @@ SRC_URI_append_toolchain-clang = "\ S = "${WORKDIR}/git" -COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' - -COMPATIBLE_HOST_arm = "null" -COMPATIBLE_HOST_libc-musl_x86 = "null" -COMPATIBLE_HOST_toolchain-clang_x86 = "null" +COMPATIBLE_HOST ?= '(x86_64|powerpc64|aarch64).*-linux' PACKAGECONFIG ??= "tcmalloc" # gperftools compilation fails for arm below v7 because of missing support of
@@ -66,10 +62,6 @@ EXTRA_OESCONS = "--prefix=${D}${prefix} \ ${PACKAGECONFIG_CONFARGS} \ core" -do_configure_prepend() { - # tests use hex floats, not supported in plain C++ - sed -e 's|-std=c++11|-std=gnu++11|g' -i ${S}/SConstruct -} scons_do_compile() { ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} ${EXTRA_OESCONS} || \ die "scons build execution failed."
Signature · 1 line
2.23.0
PATCH 2/2 uim: Fix cross-builds
riscv is not yet supported to exclude it
Signed-off-by Khem Raj <[email protected]>
--- ...it-path-from-configure-option-proper.patch | 29 +++++++++++++++++++ .../uim/0001-fix-bug-for-cross-compile.patch | 24 --------------- meta-oe/recipes-support/uim/uim_1.8.8.bb | 10 +++++-- 3 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch delete mode 100644 meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch
meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch new file +29 -0
@@ -0,0 +1,29 @@ +From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 +From: OBATA Akio <[email protected]> +Date: Fri, 10 Aug 2018 18:38:18 +0900 +Subject: [PATCH] Fix to set libedit path from configure option properly + +Upstream-Status: Backport [https://github.com/uim/uim/pull/134] +Signed-off-by: Khem Raj <[email protected]> + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 00d1b02..9c0a5ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then + if test "x$with_libedit" = xyes; then + libedit_path=/usr + else +- with_libedit=yes + libedit_path="$with_libedit" ++ with_libedit=yes + fi + + saved_CPPFLAGS=$CPPFLAGS +-- +2.23.0 +
meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch deleted +0 -24
@@ -1,24 +0,0 @@ -From 08b5e51224ed95b1e76e99873b5f9f59840b0a74 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <[email protected]> -Date: Fri, 21 Aug 2015 15:58:42 +0900 -Subject: [PATCH] fix bug for cross compile - -Signed-off-by: Lei Maohui <[email protected]> - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -1317,8 +1317,8 @@ if test "x$with_libedit" != xno; then - - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS -- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" -- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" -+ CPPFLAGS="${CPPFLAGS}" -+ LDFLAGS="${LDFLAGS}" - AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", - [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", - AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
meta-oe/recipes-support/uim/uim_1.8.8.bb +7 -3
@@ -4,11 +4,11 @@ LICENSE = "BSD-3-Clause & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" - +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ + file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ +" SRC_URI_append_class-target = "\ file://uim-module-manager.patch \ - file://0001-fix-bug-for-cross-compile.patch \ " SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc"
@@ -22,6 +22,9 @@ RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache REQUIRED_DISTRO_FEATURES = "x11"
@@ -29,6 +32,7 @@ REQUIRED_DISTRO_FEATURES = "x11" GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" EXTRA_OECONF += "--disable-emacs \ + --with-libedit=${STAGING_EXECPREFIXDIR} \ --without-scim \ --without-m17nlib \ --without-prime \
Signature · 1 line
2.23.0