babl: Drop clang10 workaround for mips/rv64
PATCH 1/5 babl: Drop clang10 workaround for mips/rv64
The issue reported in [1] works fine with clang 15+
This effectively reverts b12e87f84c4af258e8ea8cc78ed075989cbf9dcb and ff19c7c5694f79271ae26543562e5563d4250559
Signed-off-by Khem Raj <[email protected]>
--- meta-gnome/recipes-gimp/babl/babl_0.1.102.bb | 4 ---- 1 file changed, 4 deletions(-)
meta-gnome/recipes-gimp/babl/babl_0.1.102.bb +0 -4
@@ -10,10 +10,6 @@ inherit setuptools3 gnomebase gobject-introspection vala DEPENDS += "lcms" -# https://bugs.llvm.org/show_bug.cgi?id=45555 -CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " -CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " - SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" SRC_URI[sha256sum] = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0"
Signature · 1 line
2.40.0
PATCH 2/5 babl: Package /usr/lib/babl-0.1/ directory
Signed-off-by Khem Raj <[email protected]>
--- meta-gnome/recipes-gimp/babl/babl_0.1.102.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-gnome/recipes-gimp/babl/babl_0.1.102.bb +2 -0
@@ -13,4 +13,6 @@ DEPENDS += "lcms" SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" SRC_URI[sha256sum] = "a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0" +FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" + BBCLASSEXTEND = "native"
Signature · 1 line
2.40.0
PATCH 3/5 libtinyxml2: Add ptest support
In reply to Khem Raj- Switch to usong meson build system
- Fix build with musl by defining _LARGEFILE64_SOURCE
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-support/libtinyxml2/files/run-ptest | 10 ++++++++++ .../libtinyxml2/libtinyxml2_9.0.0.bb | 16 +++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-support/libtinyxml2/files/run-ptest
meta-oe/recipes-support/libtinyxml2/files/run-ptest new file +10 -0
@@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls *test`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done
meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb +11 -5
@@ -4,14 +4,20 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https" - SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ + file://run-ptest" S = "${WORKDIR}/git" -inherit cmake +inherit meson ptest -BBCLASSEXTEND = "native" +EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)}" + +CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" -EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES" +do_install_ptest() { + install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest +} + +BBCLASSEXTEND = "native"
Signature · 1 line
2.40.0
PATCH 4/5 ptest-packagelists-meta-oe: Add libtinyxml2
In reply to Khem RajIt takes < 4 seconds on qemux86_64
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 1 + 1 file changed, 1 insertion(+)
meta-oe/conf/include/ptest-packagelists-meta-oe.inc +1 -0
@@ -21,6 +21,7 @@ PTESTS_FAST_META_OE = "\ libio-pty-perl \ libmanette \ libssh \ + libtinyxml2 \ libxml++-5.0 \ libxmlb \ libyang \
Signature · 1 line
2.40.0
PATCH 5/5 minifi-cpp: Always use stat on 64bit linux
In reply to Khem Rajstat64 is an alias to stat on 64bit linux moreover this makes it work with musl where LFS64 functions are deprecated
Signed-off-by Khem Raj <[email protected]>
--- ...ot-use-LFS64-functions-on-linux-musl.patch | 35 +++++++++++++++++++ .../minifi-cpp/minifi-cpp_0.7.0.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-LFS64-functions-on-linux-musl.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 6690e7fe566445e20fec178e9e209e5f9f2fdde3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 5 Apr 2023 23:33:46 -0700 +Subject: [PATCH] Do not use LFS64 functions on linux/musl + +On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using +LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped +providing aliases for these functions [1] which means it wont compile on +newer musl systems. Therefore only use it on 32bit glibc/linux platforms +and exclude musl like cygwin or OSX + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4 + +Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589] +Signed-off-by: Khem Raj <[email protected]> +--- + thirdparty/spdlog-20170710/include/spdlog/details/os.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/spdlog-20170710/include/spdlog/details/os.h b/thirdparty/spdlog-20170710/include/spdlog/details/os.h +index 735f60147..639b07a79 100644 +--- a/thirdparty/spdlog-20170710/include/spdlog/details/os.h ++++ b/thirdparty/spdlog-20170710/include/spdlog/details/os.h +@@ -237,7 +237,7 @@ inline size_t filesize(FILE *f) + #else // unix + int fd = fileno(f); + //64 bits(but not in osx, where fstat64 is deprecated) +-#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) ++#if !defined(__FreeBSD__) && !defined(__APPLE__) && ((defined(__x86_64__) || defined(__ppc64__)) && (!defined(__linux__))) + struct stat64 st; + if (fstat64(fd, &st) == 0) + return static_cast<size_t>(st.st_size); +-- +2.40.0 +
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +1 -0
@@ -32,6 +32,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-Fix-build-with-libc.patch \ file://0001-civetweb-Disable-lto.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \
Signature · 1 line
2.40.0