diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
48 files changed, 582 insertions, 880 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch new file mode 100644 index 000000000..3dee34cd0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch @@ -0,0 +1,98 @@ +From 090a17ca338a9311d682ecc5933b32bff67cf07f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Jul 2019 14:20:14 -0700 +Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems + +Glibc 2.30 has added deprecation notice and collectd detects it as warning [1] + +Fixes +sys/sysctl.h:21:2: error: "The <sys/sysctl.h> header is deprecated and will be removed." [-Werror,-W#warnings] + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 + +Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/contextswitch.c | 2 +- + src/memory.c | 2 +- + src/swap.c | 2 +- + src/uuid.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/src/contextswitch.c ++++ b/src/contextswitch.c +@@ -26,7 +26,7 @@ + #include "common.h" + #include "plugin.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/memory.c ++++ b/src/memory.c +@@ -28,7 +28,7 @@ + #include "common.h" + #include "plugin.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + #ifdef HAVE_SYS_VMMETER_H +--- a/src/swap.c ++++ b/src/swap.c +@@ -49,7 +49,7 @@ + #if HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + #if HAVE_SYS_DKSTAT_H +--- a/src/uuid.c ++++ b/src/uuid.c +@@ -29,7 +29,7 @@ + #include "common.h" + #include "plugin.h" + +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/cpu.c ++++ b/src/cpu.c +@@ -60,7 +60,7 @@ + + #if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \ + (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME) +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + +--- a/src/processes.c ++++ b/src/processes.c +@@ -82,7 +82,7 @@ + #if HAVE_MACH_VM_PROT_H + #include <mach/vm_prot.h> + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + #endif + /* #endif HAVE_THREAD_INFO */ +--- a/src/uptime.c ++++ b/src/uptime.c +@@ -33,7 +33,7 @@ + */ + /* #endif HAVE_LIBKSTAT */ + +-#elif HAVE_SYS_SYSCTL_H ++#elif defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include <sys/sysctl.h> + /* Using sysctl interface to retrieve the boot time on *BSD / Darwin / OS X + * systems */ diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb index 6dff18c16..0951ac076 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0005-Disable-new-gcc8-warnings.patch \ file://0006-libcollectdclient-Fix-string-overflow-errors.patch \ + file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \ " SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6" SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb index e98795944..d414bc683 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20180621.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190728.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ " -SRC_URI[md5sum] = "1dba09cf45ac4ba40b3cb4a3f1d694b2" -SRC_URI[sha256sum] = "4a4859e2b22d24e46c1a529b5a5605b95503aa04da4432f7bbd713e3e867587a" +SRC_URI[md5sum] = "e9d7f8b5e7b17183b0fb9297c0f57840" +SRC_URI[sha256sum] = "e5eb0eaaef9cae8c822887bd998e33c2c3b94ebadd37b4f6aba018c0194a2a87" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb index e1a6d9508..09eab9dcd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.2.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://github.com/Yelp/dumb-init/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c" -SRC_URI = "https://github.com/Yelp/dumb-init/archive/v${PV}.tar.gz" -SRC_URI[md5sum] = "4eb7f43d7823686723ff7ac1bad097cb" -SRC_URI[sha256sum] = "74486997321bd939cad2ee6af030f481d39751bc9aa0ece84ed55f864e309a3f" +SRCREV = "b1e978e486114797347deefcc03ab12629a13cc3" +SRC_URI = "git://github.com/Yelp/dumb-init" +S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb index 4f5b248c4..7231484fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb @@ -8,8 +8,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3282e20dc3cec311deda3c6d4b1f990b" SRC_URI = "https://www.open-mpi.org/software/${BPN}/v1.11/downloads/${BP}.tar.bz2" -SRC_URI[md5sum] = "c2a2e4e23eeb719ed31a755684697cf9" -SRC_URI[sha256sum] = "ddfb7b9b4571551165b0fd824a340e58814c8c2b4af64c818579d4bc695a417d" +SRC_URI[md5sum] = "3c792e23c209e9e1bafe9bdbc613d401" +SRC_URI[sha256sum] = "a4494b7765f517c0990d1c7f09d98cb87755bb6b841e4e2cbfebca1b14bac9c8" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v1.11/" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch new file mode 100644 index 000000000..794394855 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch @@ -0,0 +1,37 @@ +From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Fri, 2 Aug 2019 10:41:26 +0800 +Subject: [PATCH] configure.ac: skip running test program when cross-compiling + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c5e3ca03..4b89396a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -140,7 +140,7 @@ AC_CHECK_FUNC([getloadavg],[AC_DEFINE([HAVE_GETLOADAVG2], 1, [getloadavg() is av + AC_FUNC_SELECT_ARGTYPES + + AC_MSG_CHECKING([for strlcpy]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + char a[2]; + if (strlcpy(a, "yes", 2) != 3) + return 1;]])], +@@ -156,7 +156,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + ]) + + AC_MSG_CHECKING([for strlcat]) +-AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ + char a[4] = "no"; + if (strlcat(a, "yes", 4) != 5) + return 1;]])], +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb new file mode 100644 index 000000000..63fca1dd1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Ice Window Manager (IceWM)" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" + +SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ + file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ + " +SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" +SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" + +inherit autotools pkgconfig gettext perlnative distro_features_check qemu +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ + --with-cfgdir=${sysconfdir}/icewm \ + --with-docdir=${docdir}/icewm \ + --enable-fribidi \ + --enable-xinerama \ + --enable-shape" + +DEPENDS = "asciidoc-native fontconfig gdk-pixbuf libxft libxpm libxrandr libxinerama libice libsm libx11 libxext libxrender" +DEPENDS_append = " qemu-native" +RDEPENDS_${PN} = "perl fribidi" + +do_compile_prepend_class-target() { + + cd ${B} + oe_runmake -C src genpref + + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" + cat >qemuwrapper <<EOF +#!/bin/sh +${qemu_binary} src/genpref "\$@" +EOF + chmod +x qemuwrapper + ./qemuwrapper > src/preferences +} + +FILES_${PN} += "${datadir}/xsessions" diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index 83e838580..b7899a11b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Tools for taking the MD5 sum of ISO images" DESCRIPTION = "Tools for taking the MD5 sum of ISO images" DEPENDS = "popt python3 openssl curl popt-native" -RDEPENDS_${PN} = "openssl curl" +RDEPENDS_${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" @@ -25,11 +25,11 @@ do_install () { oe_runmake install } -PACKAGES += "${PYTHON_PN}-${PN}" +PACKAGES += "${PYTHON_PN}-${BPN}" -RPROVIDES_${PN}-dbg += "${PYTHON_PN}-${PN}-dbg" +RPROVIDES_${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" -FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES_${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb index 54a188dc8..c5fc928a7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.22.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools python3native gobject-introspection -SRCREV = "cb308566c3c5222b8422f78997a1742713b265a9" +SRCREV = "f6e4538485d0442b3674e182c01ffe5a0f258ad4" SRC_URI = " \ git://github.com/rhinstaller/libblockdev;branch=master \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb new file mode 100644 index 000000000..1e35f08c0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "A cross-platform, lightweight Modbus RTU library" +DESCRIPTION = "liblightmodbus is a very lightweight, highly configurable, \ + platform-independent Modbus RTU library." + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +inherit cmake pkgconfig + +SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https" +SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb new file mode 100644 index 000000000..2dbeee7c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -0,0 +1,31 @@ +# Copyright (C) 2019 Ruslan Bilovol <rbilovol@cisco.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "NSS module for glibc, to provide NIS+ support for glibc" + +DESCRIPTION = "This package contains the NSS NIS+ plugin for glibc.\ +This code was formerly part of glibc, but is now standalone to\ +be able to link against TI-RPC for IPv6 support." + +HOMEPAGE = "https://github.com/thkukuk/libnss_nisplus" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +SECTION = "libs" +DEPENDS += "libtirpc libnsl2" + +PV = "1.3+git${SRCPV}" + +SRCREV = "c6934373c7bac91499ff7bbe7d2439599325ca63" + +SRC_URI = "git://github.com/thkukuk/libnss_nisplus \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND += "native nativesdk" +# +# We will skip parsing this packagegeoup for non-glibc systems +# +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index da22836a2..e50226e27 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.7.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -17,7 +17,7 @@ SRC_URI += "file://0001-Makefile.am-remove-doc-and-apidoc.patch \ file://0003-without-build-plugins.patch \ file://0004-configure.ac-remove-prog-test-of-augparse.patch \ " -SRCREV = "1d5cc00e44af4800fcae9761625dd4230681e82a" +SRCREV = "eaff08f38d771d9362923765bb404b1514c5ca0a" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.2.bb index ce73700d7..5d725bf36 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.5.2.bb @@ -14,5 +14,5 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[md5sum] = "6fe665aa6d6bf3a99eb6fa9c553283fd" -SRC_URI[sha256sum] = "04ea35b6956c7b3453f1ed3f3fe40e3ddae1f43931089124579e8384e79ed372" +SRC_URI[md5sum] = "f9dd38d273bcdec5d3d1498fe6684f42" +SRC_URI[sha256sum] = "b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4" diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb index 275a8f238..b6ab43ccf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.5.1.bb @@ -8,12 +8,12 @@ the package on many systems.\ SECTION = "devel" HOMEPAGE = "http://www.logwatch.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f2566bb12b16d2d80d90ebc533261aa7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c" RDEPENDS_${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[md5sum] = "22bd22841caa45f12c605abc3e0c2b09" -SRC_URI[sha256sum] = "1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e" +SRC_URI[md5sum] = "3d14fa6e0fb56f890d2b3fd9cbc3162f" +SRC_URI[sha256sum] = "9d4a00625065f25058f8966e7fb11f9f72db25507b4dd9c05f57e14447c33295" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch deleted file mode 100644 index 8b0096630..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 19 May 2018 23:18:11 -0700 -Subject: [PATCH] Fix formatting for modern c++11 compilers - -Fixes -error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/backend/svg/SVG_RenderingContext.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc -index 55d6097..0d50702 100644 ---- a/src/backend/svg/SVG_RenderingContext.cc -+++ b/src/backend/svg/SVG_RenderingContext.cc -@@ -68,7 +68,7 @@ void - SVG_RenderingContext::documentStart(const BoundingBox& bbox) - { - beginDocument(bbox); -- metadata("Created by "PACKAGE" version "VERSION); -+ metadata("Created by " PACKAGE " version " VERSION); - } - - void --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch deleted file mode 100644 index c5814bfe2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 5 May 2015 20:35:01 -0700 -Subject: [PATCH] include cstdio to get printf definitions - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/engine/boxml/BoxMLHOVElement.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc -index 1a2812c..96c9eea 100644 ---- a/src/engine/boxml/BoxMLHOVElement.cc -+++ b/src/engine/boxml/BoxMLHOVElement.cc -@@ -21,7 +21,7 @@ - // <http://www.gnu.org/licenses/>. - - #include <config.h> -- -+#include <cstdio> - #include "BoxMLAttributeSignatures.hh" - #include "BoxMLHOVElement.hh" - #include "BoxMLHElement.hh" --- -2.1.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch deleted file mode 100644 index b879d6a51..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 30 Aug 2016 23:24:53 +0200 -Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to - correct implementation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 31 ++++--------------------------- - 1 file changed, 4 insertions(+), 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4f2118e..16c09d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t") - - AC_LANG_PUSH(C++) - --AC_CHECK_HEADERS(unordered_map, -- [ -- AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided]) -- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1 -- ], -- [ -- GMV_HAVE_UNORDERED_MAP_CFLAGS= -- ] --) -+GMV_HAVE_UNORDERED_MAP_CFLAGS= - AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS) --AC_CHECK_HEADERS(hash_map, -- [ -- AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided]) -- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1 -- ], -- [ -- GMV_HAVE_HASH_MAP_CFLAGS= -- ] --) -+GMV_HAVE_HASH_MAP_CFLAGS= - AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS) --AC_CHECK_HEADERS(ext/hash_map, -- [ -- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) -- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 -- ], -- [ -- GMV_HAVE_EXT_HASH_MAP_CFLAGS= -- ] --) -+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided]) -+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 - AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS) - - AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits]) --- -2.5.5 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch deleted file mode 100644 index 356274d17..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch +++ /dev/null @@ -1,93 +0,0 @@ -From: Gert Wollny <gw.fossdev@gmail.com> -Date: Sun, 26 Jun 2016 13:25:00 +0200 -Description: gcc 6.0 build fixes -Bug: https://bugs.debian.org/811682 - -Slightly adapted to our environment - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- a/src/engine/common/View.cc -+++ b/src/engine/common/View.cc -@@ -291,7 +291,7 @@ - } - } - -- return false; -+ return SmartPtr<Element>(); - } - - bool ---- a/src/backend/common/tfm/TFM.hh -+++ b/src/backend/common/tfm/TFM.hh -@@ -37,7 +37,7 @@ - unsigned char face; - const char* codingScheme; - int designSize; -- int checksum; -+ unsigned int checksum; - unsigned int nDimensions; - unsigned int nCharacters; - }; -@@ -52,7 +52,7 @@ - struct Kerning - { - UChar8 index; -- int value; -+ unsigned int value; - }; - - struct Ligature -@@ -67,7 +67,7 @@ - UChar8 index; - int width; - int height; -- int depth; -+ unsigned int depth; - int italicCorrection; - unsigned char nKernings; - const Kerning* kerning; ---- a/src/backend/common/StandardSymbolsShaper.hh -+++ b/src/backend/common/StandardSymbolsShaper.hh -@@ -32,20 +32,20 @@ - struct HStretchyChar - { - Char16 ch; -- Char8 normal; -- Char8 left; -- Char8 glue; -- Char8 right; -+ UChar8 normal; -+ UChar8 left; -+ UChar8 glue; -+ UChar8 right; - }; - - struct VStretchyChar - { - Char16 ch; -- Char8 normal; -- Char8 top; -- Char8 glue; -- Char8 middle; -- Char8 bottom; -+ UChar8 normal; -+ UChar8 top; -+ UChar8 glue; -+ UChar8 middle; -+ UChar8 bottom; - }; - - protected: ---- a/src/backend/common/StandardSymbolsShaper.cc -+++ b/src/backend/common/StandardSymbolsShaper.cc -@@ -29,7 +29,7 @@ - #include "ShapingContext.hh" - - struct GlyphMap { -- Char8 index; -+ UChar8 index; - Char16 ch; - }; - diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch deleted file mode 100644 index 3fe632860..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch +++ /dev/null @@ -1,18 +0,0 @@ -Use build_cc to compile the programs to run on build host -helps with cross compiling - -Upstream-Status: Inappropriate [Cross-compiled OE specific] - -diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am -index 636ccf0..ed9921d 100644 ---- a/src/common/mathvariants/Makefile.am -+++ b/src/common/mathvariants/Makefile.am -@@ -52,7 +52,7 @@ XSLTPROC = xsltproc - %.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot - cat $(srcdir)/variant.top >$@ - $(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@ -- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< -+ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< - echo "Char32 " >>$@ - basename map_variant_$@ .cc | tr "-" "_" >>$@ - echo "(Char32 ch)" >>$@ diff --git a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb deleted file mode 100644 index 9ee9e3035..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/" -DEPENDS = "t1lib gtk+ popt libxslt-native libxml2" - -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -PR = "r3" -SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec" -PV = "0.8.0+git${SRCPV}" - -SRC_URI = "git://github.com/GNOME/gtkmathview.git \ - file://use_hostcxx.patch \ - file://0001-include-cstdio-to-get-printf-definitions.patch \ - file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \ - file://0003-gcc-6.0-build-fixes.patch \ - file://0001-Fix-formatting-for-modern-c-11-compilers.patch \ -" - -S = "${WORKDIR}/git" - -inherit distro_features_check autotools pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -do_configure_append() { - # avoid host polution inf pkg-config files - sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'` -} diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch new file mode 100644 index 000000000..7a0d286e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fallback-to-2011-C++-standard.patch @@ -0,0 +1,42 @@ +Option '-std=gnu++14' has been supported from gcc 4.9. But on some build hosts +such as CentOS 7.6 which only has gcc 4.8.5 and fails to configure: + +| checking whether the host C compiler can be used... no +| ERROR: Only GCC 4.9 or newer is supported (found version 4.8.5). + +Fallback to 2011 C++ standard and lower required gcc version to 4.8.0 which is +the same as in previous version 52.9.1 of mozjs. + +Upstream-Status: Inappropriate [Workaround] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index 9c772a8..fc640c7 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -502,10 +502,8 @@ def check_compiler(compiler, language, target): + append_flag('-std=c++14') + # GCC 4.9 indicates that it implements draft C++14 features + # instead of the full language. +- elif info.type == 'gcc' and \ +- info.language_version not in (draft_cxx14_version, +- cxx14_version): +- append_flag('-std=gnu++14') ++ elif info.type == 'gcc' and info.language_version != 201103: ++ append_flag('-std=gnu++11') + + # We force clang-cl to emulate Visual C++ 2017 version 15.4 + if info.type == 'clang-cl' and info.version != '19.11.25547': +@@ -903,9 +901,9 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, + # Check the compiler version here instead of in `compiler_version` so + # that the `checking` message doesn't pretend the compiler can be used + # to then bail out one line later. +- if info.type == 'gcc' and info.version < '4.9.0': ++ if info.type == 'gcc' and info.version < '4.8.0': + raise FatalCheckError( +- 'Only GCC 4.9 or newer is supported (found version %s).' ++ 'Only GCC 4.8 or newer is supported (found version %s).' + % info.version) + + if info.type == 'gcc' and host_or_target.os == 'Android': diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 70bdbc168..33142d6fe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -17,6 +17,7 @@ SRC_URI = "https://dev.gentoo.org/~axs/distfiles/mozjs-60.5.2.tar.bz2 \ file://0001-To-fix-build-error-on-arm32BE.patch \ file://JS_PUBLIC_API.patch \ file://0001-riscv-Disable-atomic-operations.patch \ + file://fallback-to-2011-C++-standard.patch \ " SRC_URI_append_libc-musl = " \ file://0006-support-musl.patch \ @@ -54,6 +55,9 @@ EXTRA_OECONF = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "--enable-gold", '--disable-gold', d)} \ " +# Without this, JS_Init() will fail for mips64. +EXTRA_OECONF_append_mips64 = " --with-intl-api=build" + EXTRA_OECONF_append_mipsarch = " --disable-ion" EXTRA_OECONF_append_riscv64 = " --disable-ion" EXTRA_OECONF_append_riscv32 = " --disable-ion" 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 737c13427..17ca26273 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,8 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2" -SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb" -PV = "1.9.0-git${SRCPV}" +SRCREV = "967585c9ea0e1a8818d2172d2395d8502f6180a2" +PV = "2.0.0+git${SRCPV}" SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb index 19a90ff07..595852a9f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb @@ -4,7 +4,7 @@ checking (as in assert.h) and logging (printf style debugging) in \ GNU C and C++." SECTION = "Development/Languages/C and C++" -SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${BP}.tar.gz \ +SRC_URI = "http://download.savannah.gnu.org/releases/${BPN}/${BP}.tar.gz \ file://change-mandir-to-DESTDIR.patch \ file://modify-acinclude.m4-and-configure.in.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index c59a259fc..2fdadcbc9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -10,11 +10,10 @@ DEPENDS = "libpam openldap" inherit distro_features_check REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI = "https://github.com/rmbreak/pam_ldapdb/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "2dd4f1370fcfe995ee0ad09611109b87" -SRC_URI[sha256sum] = "8ed92b36523556bb5d9bf3eb33a1035e46041d4be767c8d62136930c0ca0e45b" +SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" +SRC_URI = "git://github.com/rmbreak/pam_ldapdb" -S = "${WORKDIR}/pam_ldapdb-${PV}" +S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch new file mode 100644 index 000000000..0c79c4c09 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/0001-Fix-clang-warning-about-non-virtual-dtor.patch @@ -0,0 +1,25 @@ +From 340110292b35d367205953a59e7eab28e1f4a0bb Mon Sep 17 00:00:00 2001 +From: Daniel Frey <d.frey@gmx.de> +Date: Sat, 7 Apr 2018 09:13:51 +0200 +Subject: [PATCH] Fix clang-warning about non-virtual dtor + +Upstream-Status: Backport [https://github.com/taocpp/PEGTL/commit/340110292b35d367205953a59e7eab28e1f4a0bb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/example/pegtl/json_classes.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/example/pegtl/json_classes.hpp ++++ b/src/example/pegtl/json_classes.hpp +@@ -34,10 +34,7 @@ namespace examples + : type( in_type ) + { + } +- +- ~json_base() +- { +- } ++ virtual ~json_base() = default; + }; + + inline std::ostream& operator<<( std::ostream& o, const json_base& j ) diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb new file mode 100644 index 000000000..344a80524 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.1.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=80cb066ab204c7fe022f1cfe0c2c6818" + +SRCREV = "776fa4a1e8bda860008524f6dd9473967c8375b1" +SRC_URI = "git://git@github.com/taocpp/PEGTL.git;protocol=https;branch=master \ + file://0001-Fix-clang-warning-about-non-virtual-dtor.patch \ + " + +inherit cmake + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch index 747538b0c..ca2a1f643 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch @@ -1,4 +1,4 @@ -From 2a22dc96c3bbb5c9bbcc008f58d4f5c64e3d19e6 Mon Sep 17 00:00:00 2001 +From 231eb4c75fbfaaf90bca7702bdaf55cf701a3527 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 23 Jul 2018 11:23:39 -0700 Subject: [PATCH] jemalloc/jemalloc.cfg: Specify the host when building @@ -25,5 +25,5 @@ index 196129de6..79ebbab1c 100644 --disable-munmap +--host=${HOST_SYS} -- -2.17.1 +2.14.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch index bd1b97c24..82b96cf95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch @@ -1,7 +1,7 @@ -From 460a96e390cb80278784cfe36629e280fe7ffef7 Mon Sep 17 00:00:00 2001 +From 3863d8bd71d6a5638cf984f8d8f9cccac0c7f2a4 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Mon, 23 Jul 2018 11:31:17 -0700 -Subject: [PATCH 2/2] Makefile: Don't install the docs +Subject: [PATCH] Makefile: Don't install the docs Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Upstream-Status: Inappropriate [disable feature] @@ -10,17 +10,17 @@ Upstream-Status: Inappropriate [disable feature] 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 224a315f6..ce7f84afb 100644 +index 47a447f12..7c0f9848f 100644 --- a/Makefile +++ b/Makefile -@@ -144,7 +144,6 @@ rpm dpkg: pkg-clean source +@@ -148,7 +148,6 @@ rpm dpkg: pkg-clean install uninstall: $(MAKE) -C src $@ - $(MAKE) -C doc $@ .PHONY: all clean clobber test check cstyle check-license install uninstall\ - source rpm dpkg pkg-clean pcheck check-remote format doc $(SUBDIRS) + source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\ -- -2.17.1 +2.14.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch index f75d94197..dbe9c45e1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0003-Makefile-Don-t-build-the-examples.patch @@ -1,6 +1,6 @@ -From a7f07dca2468ea226d2f07fc0105166e75cadaf8 Mon Sep 17 00:00:00 2001 +From ac24c78f5aa62ba43bb87b74301b659bcc506f11 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 6 Sep 2018 16:18:50 -0700 +Date: Thu, 18 Jul 2019 15:40:22 +0800 Subject: [PATCH] Makefile: Don't build the examples Signed-off-by: Alistair Francis <alistair.francis@wdc.com> @@ -10,25 +10,25 @@ Upstream-Status: Inappropriate [disable feature] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 4b50dd8b5..e00501e31 100644 +index 773ab1387..58912f0ab 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -38,13 +38,13 @@ include $(TOP)/src/version.inc +@@ -37,13 +37,13 @@ include $(TOP)/src/common.inc TARGETS = libpmem libvmem libpmemblk libpmemlog libpmemobj libpmempool\ - libpmemcto libvmmalloc tools + libvmmalloc tools -ALL_TARGETS = $(TARGETS) common librpmem examples benchmarks +ALL_TARGETS = $(TARGETS) common librpmem benchmarks SCOPE_DIRS = $(TARGETS) common librpmem rpmem_common DEBUG_RELEASE_TARGETS = common libpmem libvmem libpmemblk libpmemlog libpmemobj\ - libpmempool libvmmalloc librpmem libpmemcto + libpmempool libvmmalloc librpmem -RELEASE_TARGETS = tools examples benchmarks +RELEASE_TARGETS = tools benchmarks CLEAN_NO_JE_TARGETS = $(ALL_TARGETS) rpmem_common test CLEAN_TARGETS = $(CLEAN_NO_JE_TARGETS) jemalloc -- -2.17.1 +2.14.4 diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch deleted file mode 100644 index 624f17bd4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0004-os_posix-Manually-implement-secure_getenv-if-require.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 33affa9ee97691efb73f439fcdba4adb8625a26a Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 12:59:48 -0700 -Subject: [PATCH] os_posix: Manually implement secure_getenv() if required - -Manually implement the secure_getenv() if we need to, this is required -if using musl. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/common/os_posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/common/os_posix.c b/src/common/os_posix.c -index 2d70a0a29..fb09b6ce0 100644 ---- a/src/common/os_posix.c -+++ b/src/common/os_posix.c -@@ -261,7 +261,7 @@ os_setenv(const char *name, const char *value, int overwrite) - /* - * secure_getenv -- provide GNU secure_getenv for FreeBSD - */ --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || !HAVE___SECURE_GETENV - static char * - secure_getenv(const char *name) - { --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch deleted file mode 100644 index 75c35f865..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0005-pmempool-Remove-unused-__USE_UNIX98-define.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 92e63699ea83074298971b0251f002562be4dbd3 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 13:23:37 -0700 -Subject: [PATCH 2/3] pmempool: Remove unused __USE_UNIX98 define - -Remove the unused __USE_UNIX98 to fix musl build failures. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/tools/pmempool/info.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/tools/pmempool/info.c b/src/tools/pmempool/info.c -index b4010bf35..7b890a123 100644 ---- a/src/tools/pmempool/info.c -+++ b/src/tools/pmempool/info.c -@@ -45,9 +45,6 @@ - #include <inttypes.h> - #include <assert.h> - #include <sys/param.h> --#ifndef __FreeBSD__ --#define __USE_UNIX98 --#endif - #include <unistd.h> - #include <sys/mman.h> - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch deleted file mode 100644 index 2042fdb25..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a88e806f9ce8cc071e81abad688643d53f393176 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 10 Sep 2018 14:18:38 -0700 -Subject: [PATCH 3/3] Makefile.inc: Allow extra libs to be specified - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - src/Makefile.inc | 2 ++ - src/common.inc | 2 ++ - src/tools/Makefile.inc | 1 + - 3 files changed, 5 insertions(+) - -diff --git a/src/common.inc b/src/common.inc -index 032cb83ea..2d5c4bedf 100644 ---- a/src/common.inc -+++ b/src/common.inc -@@ -74,6 +74,8 @@ GCOV_CFLAGS=-fprofile-arcs -ftest-coverage --coverage - GCOV_LDFLAGS=-fprofile-arcs -ftest-coverage - GCOV_LIBS=-lgcov - -+LIBS += $(EXTRA_LIBS) -+ - osdep = $(1)_$(shell uname -s | tr "[:upper:]" "[:lower:]")$(2) - get_arch = $(shell $(CC) -dumpmachine | awk -F'[/-]' '{print $$1}') - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb index 3da22a970..c8688b2c6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.6.bb @@ -9,18 +9,15 @@ DEPENDS = "ndctl" # Required to have the fts.h header for musl DEPENDS_append_libc-musl = " fts" -SRC_URI = "https://github.com/pmem/${BPN}/archive/${PV}.tar.gz \ +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/pmem/pmdk.git \ file://0001-jemalloc-jemalloc.cfg-Specify-the-host-when-building.patch \ file://0002-Makefile-Don-t-install-the-docs.patch \ file://0003-Makefile-Don-t-build-the-examples.patch \ - file://0005-pmempool-Remove-unused-__USE_UNIX98-define.patch \ - file://0006-Makefile.inc-Allow-extra-libs-to-be-specified.patch \ " -SRC_URI_append_libc-musl = " file://0004-os_posix-Manually-implement-secure_getenv-if-require.patch" - -SRC_URI[md5sum] = "bde73bca9ef5b90911deb0fdcfb15ccf" -SRC_URI[sha256sum] = "df7e658e75d28cd80f6d2ff7b9fc9ae2885d52f8923fdbacecfd46215115fb4c" +SRCREV = "695e6eba28c53a69a0ef7bad3cc0f45c21ef3e00" inherit autotools-brokensep pkgconfig @@ -29,36 +26,24 @@ inherit autotools-brokensep pkgconfig # | If you meant to cross compile, use `--host'. # # Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}'" +EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" # Fix the missing fts libs when using musl EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install - - # Copy these into the standard directories - install -d ${D}${bindir}/ - mv ${D}/usr/local/bin/pmempool ${D}${bindir}/ - mv ${D}/usr/local/bin/daxio ${D}${bindir}/ - - install -d ${D}${libdir} - mv ${D}/usr/local/lib/*so* ${D}${libdir}/ - - install -d ${D}${libdir}/pkgconfig - mv ${D}/usr/local/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig/ - - install -d ${D}${includedir} - mv ${D}/usr/local/include/* ${D}${includedir}/ + oe_runmake prefix=${prefix} DESTDIR=${D} install # Remove uneeded files - rm -rf ${D}/usr/local/ + rm -rf ${D}/usr/${baselib}/pmdk_debug } # Include these by default otherwise the SDK is not very useful FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" FILES_${PN} += "${libdir}/*so*" FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/*" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES_${PN} += "/usr/etc" +FILES_${PN} += "/usr/share" COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch new file mode 100644 index 000000000..82ca30739 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/Fixed-stack-trace-generation-on-aarch64.patch @@ -0,0 +1,45 @@ +From c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1 Mon Sep 17 00:00:00 2001 +From: Jun He <jun.he@arm.com> +Date: Mon, 3 Jul 2017 07:18:32 +0000 +Subject: [PATCH] Fixed stack trace generation on aarch64 + +Change-Id: I9801239c98cb7362ed07e8b9ec2ba7e45749dba7 +Signed-off-by: Jun He <jun.he@arm.com> + +* fixes also this error when building with -Werror=return-type: + debug.c:698:1: error: no return statement in function returning non-void [-Werror=return-type] + +Upstream-Status: Backport [https://github.com/antirez/redis/commit/c8ca71d40bc51e255457cd4374dd45ec9ebf8ae1] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/Makefile | 2 +- + src/debug.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 24e960593eb..a1ff4258a9d 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -40,7 +40,7 @@ + endif + + # To get ARM stack traces if Redis crashes we need a special C flag. +-ifneq (,$(findstring armv,$(uname_M))) ++ifneq (,$(filter aarch64 armv,$(uname_M))) + CFLAGS+=-funwind-tables + endif + +diff --git a/src/debug.c b/src/debug.c +index a4caa49f285..c976d0ed919 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -691,6 +691,8 @@ + return (void*) uc->uc_mcontext.sc_ip; + #elif defined(__arm__) /* Linux ARM */ + return (void*) uc->uc_mcontext.arm_pc; ++ #elif defined(__aarch64__) /* Linux AArch64 */ ++ return (void*) uc->uc_mcontext.pc; + #endif + #else + return NULL; diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 63ab44b6a..5df5312a0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -10,6 +10,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://hiredis-use-default-CC-if-it-is-set.patch \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ + file://Fixed-stack-trace-generation-on-aarch64.patch \ file://redis.conf \ file://init-redis-server \ file://redis.service \ diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb index 9e57dd520..16c63a752 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.4.0.bb @@ -14,3 +14,5 @@ SRCREV = "e96443dda3c080fa991decec26bc4ac98d24b9a2" S = "${WORKDIR}/git" inherit autotools pkgconfig + +CPPFLAGS += "-Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb index f1a6e8535..4092833fc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1903.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb @@ -29,9 +29,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "f0d454c79d4040e3f25fcd12f8f33fe2" -SRC_URI[sha256sum] = "d0d23a493dcec64c7b6807a1bb8ee864ed0f3760c2ff3088008bb661d304056f" - +SRC_URI[md5sum] = "97682af2b1d87f903458cfb41725fba6" +SRC_URI[sha256sum] = "eb27535ece93174ef6b551c88467d2c9cd826b62479625bb881a53d50b079fb5" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch deleted file mode 100644 index 976e0380e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Mon, 21 Nov 2011 12:00:54 +0100 -Subject: [PATCH] t1lib: add 5.1.2 - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - configure.in | 95 ++++++++++++++++++++++++------------------------------------ - 1 file changed, 38 insertions(+), 57 deletions(-) - -diff --git a/configure.in b/configure.in -index eade4c0..e649ea9 100644 ---- a/configure.in -+++ b/configure.in -@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION) - T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" - - --dnl We use this file by Andreas Zeller to check for libXaw --builtin(include, ac-tools/ice_find_athena.m4) --builtin(include, ac-tools/aclocal.m4) -+#dnl We use this file by Andreas Zeller to check for libXaw -+#builtin(include, ac-tools/ice_find_athena.m4) -+#builtin(include, ac-tools/aclocal.m4) - - dnl We want these before the checks, so the checks can modify their values. - test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) -@@ -162,6 +162,7 @@ fi - - dnl **** Check for underscore on external symbols **** - -+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix]) - AC_CACHE_CHECK("whether external symbols need an underscore prefix", - ac_cv_c_extern_prefix, - [saved_libs=$LIBS -@@ -179,68 +180,48 @@ then - AC_DEFINE(NEED_UNDERSCORE_PREFIX) - fi - --dnl **** Check which ANSI integer type is 16 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(short)==2) -- return(0); -- else if (sizeof(int)==2) -- return(1); -- else -- return(2); --}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=)) --if test "$ac_16bit_type" = "short" --then -- T1_AA_TYPE16="-DT1_AA_TYPE16=short" -- T1_INT16="short" --else -- T1_AA_TYPE16="-DT1_AA_TYPE16=int" -- T1_INT16="int" -+dnl **** Check which ANSI integer type is 16 bit -+T1_AA_TYPE16="" -+for type in short int; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then -+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" -+ T1_INT16="$type" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE16" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") - fi - -- - dnl **** Check which ANSI integer type is 32 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(int)==4) -- return(0); -- else if (sizeof(long)==4) -- return(1); -- else -- return(2); --}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=)) --if test "$ac_32bit_type" = "int" --then -- T1_AA_TYPE32="-DT1_AA_TYPE32=int" -- T1_INT32="int" --else -- T1_AA_TYPE32="-DT1_AA_TYPE32=long" -- T1_INT32="long" -+T1_AA_TYPE32="" -+for type in int long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then -+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" -+ T1_INT32="$type" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE32" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") - fi - -- - dnl **** Check which ANSI integer type is 64 bit -- --AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, -- AC_TRY_RUN([ --int main(void) { -- if (sizeof(long)==8) -- return(0); -- else -- return(1); --}], ac_64bit_type="long", ac_64bit_type="<none>")) --if test "$ac_64bit_type" = "long" --then -- T1_AA_TYPE64="-DT1_AA_TYPE64=long" --else -- T1_AA_TYPE64= -+T1_AA_TYPE64="" -+for type in long long_long; do -+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then -+ AC_MSG_WARN("$type is 64 bit") -+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" -+ break -+ fi -+done -+ -+if test x"$T1_AA_TYPE64" = "x"; then -+ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") - fi - -- - CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\"" - - dnl **** Check for functions and header files **** diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch deleted file mode 100644 index bc2476bfc..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch +++ /dev/null @@ -1,58 +0,0 @@ -From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Mar 2017 23:13:36 -0800 -Subject: [PATCH] t1lib: Fix printf format string errors - -Fix printf formats to use format qualifiers -fixes - -error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- - lib/t1lib/t1subset.c | 2 +- - lib/type1/objects.c | 2 +- - lib/type1/objects.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c -index da427b2..e76974f 100644 ---- a/lib/t1lib/t1subset.c -+++ b/lib/t1lib/t1subset.c -@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, - tr_len); - T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, - T1LOG_DEBUG); -- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ -+ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ - } - - /* compute size of output file */ -diff --git a/lib/type1/objects.c b/lib/type1/objects.c -index c413a0f..f828e6a 100644 ---- a/lib/type1/objects.c -+++ b/lib/type1/objects.c -@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict - - sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", - name, TypeFmt(expect), TypeFmt(obj->type)); -- IfTrace0(TRUE,typemsg); -+ IfTrace1(TRUE, "%s", typemsg); - - ObjectPostMortem(obj); - -diff --git a/lib/type1/objects.h b/lib/type1/objects.h -index 13cbae7..3a1d337 100644 ---- a/lib/type1/objects.h -+++ b/lib/type1/objects.h -@@ -214,7 +214,7 @@ struct xobject { - /*SHARED*/ - /* NDW: personally, I want to see status and error messages! */ - #define IfTrace0(condition,model) \ -- {if (condition) printf(model);} -+ {if (condition) fputs(model,stdout);} - #define IfTrace1(condition,model,arg0) \ - {if (condition) printf(model,arg0);} - #define IfTrace2(condition,model,arg0,arg1) \ diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch deleted file mode 100644 index da54f87ab..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch +++ /dev/null @@ -1,144 +0,0 @@ -From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Mon, 21 Nov 2011 12:00:54 +0100 -Subject: [PATCH] t1lib: add 5.1.2 - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - Makefile.in | 5 +++-- - examples/Makefile.in | 5 +++-- - lib/Makefile.in | 6 ++++-- - lib/t1lib/Makefile.in | 6 ++++-- - lib/type1/Makefile.in | 6 ++++-- - type1afm/Makefile.in | 6 ++++-- - xglyph/Makefile.in | 6 ++++-- - 7 files changed, 26 insertions(+), 14 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 29c3468..396c020 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -18,7 +18,8 @@ - # Last modified: 2005-05-01 - # - --SHELL = /bin/sh -+SHELL = @SHELL@ -+LIBTOOL = @LIBTOOL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -@@ -149,7 +150,7 @@ distclean: clean - $(RM) examples/Makefile - $(RM) xglyph/Makefile - $(RM) doc/Makefile -- $(RM) libtool -+ $(RM) $(LIBTOOL) - - - # The following two targets are for building and cleaning the python- -diff --git a/examples/Makefile.in b/examples/Makefile.in -index b301db5..7a6a514 100644 ---- a/examples/Makefile.in -+++ b/examples/Makefile.in -@@ -14,9 +14,10 @@ - # Last modified: 2001-04-01 - # - -+top_builddir = @top_builddir@ - --LIBTOOL = ../libtool --SHELL = /bin/sh -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/Makefile.in b/lib/Makefile.in -index 89e5e86..6e0f960 100644 ---- a/lib/Makefile.in -+++ b/lib/Makefile.in -@@ -15,8 +15,10 @@ - # - # Contributions by H.Kakugawa to use libtool! - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in -index a6c2478..32434b3 100644 ---- a/lib/t1lib/Makefile.in -+++ b/lib/t1lib/Makefile.in -@@ -14,8 +14,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in -index 241f124..42efa94 100644 ---- a/lib/type1/Makefile.in -+++ b/lib/type1/Makefile.in -@@ -14,8 +14,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in -index 61611e1..9b51406 100644 ---- a/type1afm/Makefile.in -+++ b/type1afm/Makefile.in -@@ -15,8 +15,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ -diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in -index 8da9b63..741334c 100644 ---- a/xglyph/Makefile.in -+++ b/xglyph/Makefile.in -@@ -15,8 +15,10 @@ - # - # Modified by H.Kakugawa to use libtool - --LIBTOOL = ../libtool --SHELL = /bin/sh -+top_builddir = @top_builddir@ -+ -+LIBTOOL = @LIBTOOL@ -+SHELL = @SHELL@ - CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ diff --git a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb deleted file mode 100644 index 826dbda85..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A Type1 Font Rastering Library" -SECTION = "libs" -DEPENDS = "virtual/libx11 libxaw" - -LICENSE = "LGPLv2 & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \ - file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \ -" - -SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ - file://configure.patch \ - file://libtool.patch \ - file://format_security.patch" -SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" -SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" - -inherit autotools-brokensep distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -# Fix GNU_HASH problem -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF = "--with-x --without-athena" -EXTRA_OEMAKE = "without_doc" - -FILES_${PN} += " ${datadir}/t1lib/t1lib.config" -FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" - diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch deleted file mode 100644 index 4b17087ef..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Replace-strncpy-with-memcpy.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d314f26e024aaf15bf4ab22ceb98501148d0eac8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 May 2018 19:53:33 -0700 -Subject: [PATCH] Replace strncpy with memcpy - -gcc8 detects that strncpy is overwiritng the null terminating character -the source strings are already initialized to 0 so memcpy would do the same -job - -Fixes -rn2903.c:153:5: error: 'strncpy' output may be truncated copying 16 bytes from a string of length 511 [-Werror=stringop-truncation] - strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ecezo/ecezo.c | 2 +- - src/rn2903/rn2903.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ecezo/ecezo.c b/src/ecezo/ecezo.c -index 6a195fc1..56c6dab3 100644 ---- a/src/ecezo/ecezo.c -+++ b/src/ecezo/ecezo.c -@@ -488,7 +488,7 @@ int ecezo_send_command(const ecezo_context dev, char *cmd, char *buffer, - // our write buffer - char writeBuffer[ECEZO_MAX_BUFFER_LEN]; - -- strncpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN); -+ memcpy(writeBuffer, cmd, ECEZO_MAX_BUFFER_LEN-1); - writeBuffer[ECEZO_MAX_BUFFER_LEN - 1] = 0; - - int writelen = strlen(writeBuffer); -diff --git a/src/rn2903/rn2903.c b/src/rn2903/rn2903.c -index f30a33ae..01a011da 100644 ---- a/src/rn2903/rn2903.c -+++ b/src/rn2903/rn2903.c -@@ -150,7 +150,7 @@ static rn2903_context _rn2903_postinit(rn2903_context dev, - rn2903_close(dev); - return NULL; - } -- strncpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); -+ memcpy(dev->hardware_eui, dev->resp_data, RN2903_MAX_HEX_EUI64); - - return dev; - } --- -2.17.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch new file mode 100644 index 000000000..40856fcf0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-Use-stdint-types.patch @@ -0,0 +1,139 @@ +From 5a1e731d71d577f56a2c013e4a75a8e90188e63b Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 9 Jul 2019 05:21:59 -0700 +Subject: [PATCH] Use stdint types + +Fixes compilation with musl. + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +--- + src/bma250e/bma250e.cxx | 16 ++++++++-------- + src/bmg160/bmg160.cxx | 10 +++++----- + src/bmi160/bosch_bmi160.h | 2 +- + src/bmm150/bmm150.cxx | 8 ++++---- + 4 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/src/bma250e/bma250e.cxx b/src/bma250e/bma250e.cxx +index a8792782..1b3ecdd8 100644 +--- a/src/bma250e/bma250e.cxx ++++ b/src/bma250e/bma250e.cxx +@@ -195,35 +195,35 @@ BMA250E::BMA250E(std::string initStr) : mraaIo(initStr) + fifoConfig(mode, axes); + } + if(tok.substr(0, 20) == "setInterruptEnable0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable0(bits); + } + if(tok.substr(0, 20) == "setInterruptEnable1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable1(bits); + } + if(tok.substr(0, 20) == "setInterruptEnable2:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable2(bits); + } + if(tok.substr(0, 17) == "setInterruptMap0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap1(bits); + } + if(tok.substr(0, 17) == "setInterruptMap2:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap2(bits); + } + if(tok.substr(0, 16) == "setInterruptSrc:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setInterruptSrc(bits); + } + if(tok.substr(0, 26) == "setInterruptOutputControl:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(26), nullptr, 0); + setInterruptOutputControl(bits); + } + if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { +diff --git a/src/bmg160/bmg160.cxx b/src/bmg160/bmg160.cxx +index 1a0939f8..2438c399 100644 +--- a/src/bmg160/bmg160.cxx ++++ b/src/bmg160/bmg160.cxx +@@ -173,23 +173,23 @@ BMG160::BMG160(std::string initStr) : mraaIo(initStr) + fifoConfig(mode, axes); + } + if(tok.substr(0, 20) == "setInterruptEnable0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(20), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(20), nullptr, 0); + setInterruptEnable0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap0:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap0(bits); + } + if(tok.substr(0, 17) == "setInterruptMap1:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setInterruptMap1(bits); + } + if(tok.substr(0, 16) == "setInterruptSrc:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setInterruptSrc(bits); + } + if(tok.substr(0, 26) == "setInterruptOutputControl:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(26), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(26), nullptr, 0); + setInterruptOutputControl(bits); + } + if(tok.substr(0, 26) == "setInterruptLatchBehavior:") { +diff --git a/src/bmi160/bosch_bmi160.h b/src/bmi160/bosch_bmi160.h +index 87ca2249..cd9efe6f 100644 +--- a/src/bmi160/bosch_bmi160.h ++++ b/src/bmi160/bosch_bmi160.h +@@ -81,7 +81,7 @@ typedef int16_t s16;/**< used for signed 16bit */ + typedef int32_t s32;/**< used for signed 32bit */ + typedef int64_t s64;/**< used for signed 64bit */ + +-typedef u_int8_t u8;/**< used for unsigned 8bit */ ++typedef uint8_t u8;/**< used for unsigned 8bit */ + typedef u_int16_t u16;/**< used for unsigned 16bit */ + typedef u_int32_t u32;/**< used for unsigned 32bit */ + typedef u_int64_t u64;/**< used for unsigned 64bit */ +diff --git a/src/bmm150/bmm150.cxx b/src/bmm150/bmm150.cxx +index 234ebf92..02436788 100644 +--- a/src/bmm150/bmm150.cxx ++++ b/src/bmm150/bmm150.cxx +@@ -170,19 +170,19 @@ BMM150::BMM150(std::string initStr) : mraaIo(initStr) + setOpmode(opmode); + } + if(tok.substr(0, 19) == "setInterruptEnable:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(19), nullptr, 0); + setInterruptEnable(bits); + } + if(tok.substr(0, 19) == "setInterruptConfig:") { +- u_int8_t bits = (u_int8_t)std::stoul(tok.substr(19), nullptr, 0); ++ uint8_t bits = (uint8_t)std::stoul(tok.substr(19), nullptr, 0); + setInterruptConfig(bits); + } + if(tok.substr(0, 17) == "setRepetitionsXY:") { +- u_int8_t reps = (u_int8_t)std::stoul(tok.substr(17), nullptr, 0); ++ uint8_t reps = (uint8_t)std::stoul(tok.substr(17), nullptr, 0); + setRepetitionsXY(reps); + } + if(tok.substr(0, 16) == "setRepetitionsZ:") { +- u_int8_t reps = (u_int8_t)std::stoul(tok.substr(16), nullptr, 0); ++ uint8_t reps = (uint8_t)std::stoul(tok.substr(16), nullptr, 0); + setRepetitionsZ(reps); + } + if(tok.substr(0, 14) == "setPresetMode:") { diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch b/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch deleted file mode 100644 index a0a47411d..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 21 Jun 2018 18:39:16 -0700 -Subject: [PATCH] include sys/types.h for uint definition - -uint is defined in sys/types.h, therefore this -header needs to be included, it gets exposed with -musl where this header is not getting included indirectly -as it is happening when building on glibc - -Fixes build errors on musl e.g. -upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared -| void setBufferThreshold(uint samples); -| ^~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656] - src/kx122/kx122.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h -index 1622ed50..56e5215e 100644 ---- a/src/kx122/kx122.h -+++ b/src/kx122/kx122.h -@@ -31,6 +31,7 @@ extern "C"{ - #include <assert.h> - #include <unistd.h> - #include <math.h> -+#include <sys/types.h> - - #include <mraa/i2c.h> - #include <mraa/spi.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index 8854a33bc..a6b379ec3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa" -PV = "1.6.0-git${SRCPV}" +SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" +PV = "2.0.0+git${SRCPV}" SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ - file://0001-Replace-strncpy-with-memcpy.patch \ - file://0001-include-sys-types.h-for-uint-definition.patch \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ + file://0001-Use-stdint-types.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index 398ca5c21..3103748e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -31,8 +31,7 @@ PACKAGECONFIG ??= "python3" PACKAGECONFIG[python] = "--with-python,--without-python,python,python" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" -RDEPENDS_python3-${PN} += "${PN}" - -PACKAGES += "python3-${PN}" -FILES_python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-${BPN} += "${PN}" +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb new file mode 100644 index 000000000..b5d95d940 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb @@ -0,0 +1,35 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" + +SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" |