diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 04:55:29 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 18:27:19 +0300 |
| commit | 4b7c115404e4e18ca796c16a64c04ba299bf5cd0 (patch) | |
| tree | aa5cf8759c4a5e15cc12e8795aa189b8e2d02b4a /meta-openembedded/meta-oe/recipes-devtools | |
| parent | 6ce62a20847b1bd500386c842cf8b801b678bd1c (diff) | |
| download | openbmc-4b7c115404e4e18ca796c16a64c04ba299bf5cd0.tar.xz | |
meta-openembedded: subtree update:164a6030b0..f623d8b574
Adrian Freihofer (1):
paho-mqtt-c: upgrade 1.3.6 -> 1.3.7
Alexander Kamensky (2):
makedumpfile: add PACKAGECONFIG options for lzo and snappy compression
makedumpfile: upgrade 1.6.7 -> 1.6.8
Alexander Kanavin (4):
collect: do not build with -Werror
libsigrokdecode: add python 3.9 support
python3-mprpc: remove the recipe
gnome-calendar: update to 3.38.1, add libhandy 1.x support
Anatol Belski (1):
chrony: Patch CVE-2020-14367
Bartosz Golaszewski (1):
libgpiod: update v1.4.4 -> v1.4.5
Beni (1):
unbound: upgrade to 1.12.0
Gregory Anders (5):
Add suitesparse
Add python3-transitions
Add python3-dill
Add python3-cerberus
Add python3-cvxopt
Hongxu Jia (1):
lvm2.inc: switch branch master to main
Jasper Orschulko (1):
upgrade and de-blacklist nanopb recipe
Jose Quaresma (3):
spirv-tools: moved into OE-core, delete from meta-oe
srt: add receipe
opencv: Update 4.4.0 -> 4.5.0
Kai Kang (4):
xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2
xfce4-weather-plugin: 0.10.1 -> 0.10.2
xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0
tumbler: 0.2.9 -> 0.3.1
Khem Raj (71):
nodejs: Fix arm32/thumb builds with clang
nodejs: Update to 12.19.0
redis: Fix build on 32bit targets and clang
gperftools: Fix build with new musl updates
minifi-cpp: Fix build with riscv64/clang
graphviz: Upgrade to 2.44.1 release
musl-nscd: Update to latest
remmina: Update to 1.4.8
mdbus2: Fix build with vala 0.50
ibus: Update to 1.5.3 plus fix for vala 0.50
networkd-dispatcher: Upgrade to 2.1
geoclue: Use git fetcher
kernel-selftest: Disable vm packageconfig for riscv
layer.conf: Add hardknott to LAYERSERIES_COMPAT
fmt: Upgrade to 7.1.2
lksctp-tools: Update to latest master
fuse3: Upgrade to 3.10.0
rdma-core: Upgrade to 31.1
opengl-es-cts: Disable LTO
fluentbit: Disable LTO
traceroute: Fix build with LTO
cmocka: Fix buils with LTO
dovecot: Disable LTO
redis-plus-plus: Upgrade to 1.2.1
suitesparse: Exclude from world
python3-icu: Update to 2.6
meta-python: Drop RDEPEND'ing on python3-typing
python3-cvxopt: Exclude from world builds
packagegroup-meta-multimedia: Add srt
gedit: Inherit python3targetconfig
gmime: Fix append to do_configure
dconf: Add leading whitespace for append operator
kexec-tools-klibc: Add leading whitespace for append operator
spice: Add leading whitespace for append operator
meta-oe: Add leading whitespace for append operator
libgusb: Update to 0.3.5
botan: Mark incompatible with riscv32
projucer: Link with libatomic on rv32
mariadb: Fix build on 32bit arches with 64bit time_t
liburing: Fix build on 32-bit arches with 64-bit time_t
librtorrent: Disable instrumentation on rv32
ntopng: Link with libatomic on rv32
poco: Add riscv32 support
capnproto: Fix build on 32bit arches with 64bit time_t defaults
directfb: Fix build on riscv32
opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32
rocksdb: Update to 6.12.7
qpdf: Link with libatomic on rv32
libkcapi: Fix build on riscv32
jack: Upgrade to 1.19.16
vlc: Fix build on riscv32
fluentbit: Link with libatomic on riscv32
openipmi: Inherit python3targetconfig
libplist: Inherit python3targetconfig
postgresql: Inherit python3targetconfig
python-grpcio-tools: Add missing space for append
python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME
thingsboard-gateway: Move under dynamic layers
musl-nscd: Replace -fcommon with code patch
musl-nscd: Add missing deps on flex and bison during build
python3-pytest: Upgrade to 6.1.2
python3-hypothesis: Add recipe
python3-sortedcontainers: Add recipe
heaptrack: Fix build on musl
heaptrack: Mark RISCV host incompatible
packagegroup-meta-oe: Exclude heaptrack for rv32/rv64
chrony: Upgrade to 4.0
canutils,can-utils: Add cansequence to u-a as well
packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3
pipewire: Link with libatomic for riscv32
python3-matplotlib: Disable LTO for clang/riscv
Kory Maincent (1):
libftdi: add swig-native to dependencies
Leon Anavi (37):
python3-luma-oled: Upgrade 3.6.0 -> 3.7.0
python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2
python3-pyexpect: Upgrade 1.0.20 -> 1.0.21
python3-markdown: Upgrade 3.3.2 -> 3.3.3
python3-sh: Upgrade 1.14.0 -> 1.14.1
python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0
python3-aiohttp: Upgrade 3.7.1 -> 3.7.2
python3-aiofiles: Upgrade 0.5.0 -> 0.6.0
python3-regex: Upgrade 2020.10.23 -> 2020.10.28
python3-dateparser: Upgrade 0.7.6 -> 1.0.0
python3-langtable: Upgrade 0.0.53 -> 0.0.54
python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1
python3-tornado: Upgrade 6.0.4 -> 6.1
python3-ipython: Upgrade 7.18.1 -> 7.19.0
python3-cmd2: Upgrade 1.3.11 -> 1.4.0
python3-dill: Upgrade 0.3.2 -> 0.3.3
python3-colorlog: Upgrade 4.4.0 -> 4.6.2
python3-pandas: Upgrade 1.1.3 -> 1.1.4
python3-attrs: 20.2.0 -> 20.3.0
python3-gmqtt: Upgrade 0.6.7 -> 0.6.8
python3-diskcache: Upgrade 5.0.3 -> 5.1.0
python3-croniter: Upgrade 0.3.35 -> 0.3.36
python3-bitarray: Upgrade 1.6.0 -> 1.6.1
python3-certifi: Upgrade 2020.6.20 -> 2020.11.8
python3-cantools: Upgrade 35.3.0 -> 35.5.0
python3-arpeggio: Upgrade 1.9.2 -> 1.10.1
python3-toml: Upgrade 0.10.1 -> 0.10.2
python3-pyrad: Upgrade 2.3 -> 2.4
python3-bitstruct: Upgrade 8.11.0 -> 8.11.1
python3-yarl: Upgrade 1.6.2 -> 1.6.3
python3-luma-core: Upgrade 1.17.3 -> 2.0.1
python3-luma-oled: Upgrade 3.7.0 -> 3.8.1
python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0
python3-ansi2html: Upgrade 1.5.2 -> 1.6.0
python3-prettytable: Upgrade 1.0.1 -> 2.0.0
python3-urllib3: Upgrade 1.25.11 -> 1.26.2
python3-transitions: Upgrade 0.8.4 -> 0.8.5
Li Zhou (1):
ptpd: Solve memory leak for function NTPDCrequest
Maciej Pijanowski (2):
cdrkit: add native to BBCLASSEXTEND
cdrkit: split into more packages
Mark Jonas (5):
mbedtls: Fix typo in PACKAGECONFIG
python3-pyinotify: Add missing ctypes dependency
libsocketcan: Add PACKAGECONFIG options
libsocketcan: Update to 0.0.12
imagemagick: Add NOTICE to collected license texts
Max Kellermann (1):
php: remove the failing ${D}/${TMPDIR} code
Mingli Yu (6):
ndpi: add new recipe
libmaxminddb: add new recipe
ntopng: add new recipe
ntop: remove the recipe
packagegroup-meta-networking.bb: add ntopng related recipes
traceroute: set VPATH
Nick Rosbrook (3):
strongswan: add some PACKAGECONFIG options for EAP
strongswan: do not use deprecated stroke and starter by default
strongswan: remove ldap from default PACKAGECONFIG
Pierre-Jean Texier (1):
inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0
Randy Witt (1):
numactl: Remove the recipe
Ricardo Salveti (3):
wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908
wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827
wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112
Sakib Sajal (1):
libssh2: fix ptest
Sinan Kaya (3):
collectd: fix the test condition for dash compatibility
heaptrack: add bitbake recipe
cpp-netlib: add bitbake recipe
Tim Orling (16):
python3-atomicwrites: drop (moved to oe-core)
python3-attrs: drop (moved to oe-core)
python3-iniconfig: drop (moved to oe-core)
python3-more-itertools: drop (moved to oe-core)
python3-pathlib2: drop (moved to oe-core)
python3-toml: drop (moved to oe-core)
python3-py: drop (moved to oe-core)
python3-setuptools-scm: drop (moved to oe-core)
python3-packaging: drop (moved to oe-core)
python3-wcwidth: drop (moved to oe-core)
python3-zipp: drop (moved to oe-core)
python3-importlib-metadata: drop (moved to oe-core)
python3-pluggy: drop (moved to oe-core)
python3-pytest: drop (moved to oe-core)
python3-hypothesis: drop (moved to oe-core)
python3-sortedcontainers: drop (moved to oe-core)
Trevor Gamblin (2):
python3-jinja2: Fix ptest RDEPENDS and file installation
python3-markupsafe: Fix ptest RDEPENDS and installation
William A. Kennington III (1):
span-lite: Bump e03d116..0.8.1
Yi Zhao (5):
minifi-cpp: specify GCC_AR and GCC_RANLIB
quagga: unify volatiles file name
minifi-cpp: depend on nettle and lz4
nss: upgrade 3.57 -> 3.59
krb5: upgrade 1.17.1 -> 1.17.2
Zang Ruochen (19):
libnftnl: upgrade 1.1.7 -> 1.1.8
xfsprogs: upgrade 5.8.0 -> 5.9.0
radvd: upgrade 2.18 -> 2.19
fmt: upgrade 7.0.3 -> 7.1.0
hidapi: upgrade 0.9.0 -> 0.10.0
libkcapi: upgrade 1.2.0 -> 1.2.1
modemmanager: upgrade 1.14.2 -> 1.14.6
nvme-cli: upgrade 1.12 -> 1.13
ostree: upgrade 2020.6 -> 2020.7
poppler-data: upgrade 0.4.9 -> 0.4.10
nftables: upgrade 0.9.6 -> 0.9.7
toybox: upgrade 0.8.3 -> 0.8.4
fbgrab: upgrade 1.3.3 -> 1.4
mraa: upgrade 2.1.0 -> 2.2.0
opensaf: upgrade 5.20.05 -> 5.20.08
openvpn: upgrade 2.4.9 -> 2.5.0
poppler: upgrade 20.10.0 -> 20.11.0
tmux: upgrade 3.1b -> 3.1c
xmlsec1: upgrade 1.2.30 -> 1.2.31
changqing.li@windriver.com (1):
thin-provisioning-tools: switch branch from master to main
hasan.men (2):
thingsboard-gateway: Add recipe for v2.5.2
python3-jsonpath-rw: Add recipe for v1.4.0
richard (1):
poco: Upgrade 1.9.4 -> 1.10.1
viatsk (1):
tcpdump: Patch for CVE-2020-8037
zangrc (27):
sshfs-fuse: upgrade 3.7.0 -> 3.7.1
can-utils: upgrade 2020.02.04 -> 2020.11.0
hwdata: upgrade 0.340 -> 0.341
libio-pty-perl: upgrade 1.14 -> 1.15
live555: upgrade 20200819 -> 20201105
zile: upgrade 2.4.14 -> 2.4.15
rdma-core: upgrade 31.1 -> 32.0
strongswan: upgrade 5.8.4 -> 5.9.1
fio: upgrade 3.22 -> 3.24
libharu: Fix the packaging bug
modemmanager: upgrade 1.14.6 -> 1.14.8
openldap: upgrade 2.4.51 -> 2.4.56
protobuf: upgrade 3.13.0.1 -> 3.14.0
nghttp2: upgrade 2.41.0 -> 2.42.0
nngpp: upgrade 1.2.4 -> 1.3.0
snort: upgrade 2.9.16.1 -> 2.9.17
weechat: upgrade 2.9 -> 3.0
cjson: upgrade 1.7.13 -> 1.7.14
cloc: upgrade 1.84 -> 1.88
jpnevulator: upgrade 2.3.5 -> 2.3.6
libjcat: upgrade 0.1.3 -> 0.1.4
libsigc++-3: upgrade 3.0.3 -> 3.0.6
ocl-icd: upgrade 2.2.12 -> 2.2.13
opencl-clhpp: upgrade 2.0.11 -> 2.0.12
ostree: upgrade 2020.7 -> 2020.8
pkcs11-helper: upgrade 1.26 -> 1.27
netplan: upgrade 0.99 -> 0.100
zhengruoqin (1):
dnf-plugin-tui: Update to the latest version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
25 files changed, 635 insertions, 27 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch new file mode 100644 index 000000000..43da4a9ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto/0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch @@ -0,0 +1,38 @@ +From e2a05a19e9dc51287e19cc9f11fd91449219e361 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Nov 2020 12:10:28 -0800 +Subject: [PATCH] mutex: Fix build on 32-bit architectures using 64-bit time_t + +mutex code uses SYS_futex, which it expects from system C library. +in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) +rv32 is using 64bit time_t from get go unlike other 32bit architectures +in glibc, therefore it wont have NR_futex defined but just NR_futex_time64 +this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +Upstream-Status: Submitted [https://github.com/capnproto/capnproto/pull/1103] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + c++/src/kj/mutex.c++ | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/c++/src/kj/mutex.c++ b/c++/src/kj/mutex.c++ +index c81cead7..e1594b11 100644 +--- a/c++/src/kj/mutex.c++ ++++ b/c++/src/kj/mutex.c++ +@@ -39,7 +39,13 @@ + + #ifndef SYS_futex + // Missing on Android/Bionic. ++#ifdef __NR_futex + #define SYS_futex __NR_futex ++#elif defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#else ++#error "Need working SYS_futex" ++#endif + #endif + + #ifndef FUTEX_WAIT_PRIVATE +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb index 71f94badf..54e9daee7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb @@ -5,7 +5,9 @@ SECTION = "console/tools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV} \ + file://0001-mutex-Fix-build-on-32-bit-architectures-using-64-bit.patch;patchdir=../ \ + " SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" S = "${WORKDIR}/git/c++" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb index e6174821f..0e33275e2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.14.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" SRC_URI = "git://github.com/DaveGamble/cJSON.git" -SRCREV = "39853e5148dad8dc5d32ea2b00943cf4a0c6f120" +SRCREV = "d2735278ed1c2e4556f53a7a782063b31331dbf7" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb index 3e46c726c..b6a4ae773 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.84.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.88.bb @@ -6,8 +6,8 @@ LICENSE="GPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" SRC_URI = "https://github.com/AlDanial/cloc/releases/download/${PV}/${BP}.tar.gz" -SRC_URI[md5sum] = "a52f3843825377cfa4e4b3b30a567ab4" -SRC_URI[sha256sum] = "c3f0a6bd2319110418ccb3e55a7a1b6d0edfd7528bfd2ae5d530938abe90f254" +SRC_URI[md5sum] = "9f12f29c824ef61c5eaba6cf2dd6e183" +SRC_URI[sha256sum] = "e4e30f083bf4e4a5efbe29efa0f6cefa223ba4e841ad1337653ad1f52702dc6f" UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 2a4209344..887b2a4f3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,10 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "95f3c6ab36840fb1e0f4935f34dbf8f708b7780c" +SRCREV = "6d3fab9b9559b6a483fe668e39c29126cdbb58d8" PV = "1.2" -SRC_URI_append_class-target = "file://oe-remote.repo.sample" +SRC_URI_append_class-target = " file://oe-remote.repo.sample" inherit distutils3-base diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb index 752562eb3..c25ce360e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.24.3.bb @@ -62,6 +62,6 @@ do_configure_prepend_toolchain-clang_x86() { BBCLASSEXTEND = "native nativesdk" -SYSROOT_DIRS_BLACKLIST_append_class-target = "${baselib}/cmake/grpc" +SYSROOT_DIRS_BLACKLIST_append_class-target = " ${baselib}/cmake/grpc" FILES_${PN}-dev += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch new file mode 100644 index 000000000..9681086a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0001-libheaptrack-Replace-__pid_t-with-pid_t.patch @@ -0,0 +1,26 @@ +From 18671cd6028f996c138c6eb4282caf313f3fc605 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:25:18 -0800 +Subject: [PATCH] libheaptrack: Replace __pid_t with pid_t + +__pid_t is for internal libc use + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/libheaptrack.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp +index e138bce..4120ecd 100644 +--- a/src/track/libheaptrack.cpp ++++ b/src/track/libheaptrack.cpp +@@ -79,7 +79,7 @@ chrono::milliseconds elapsedTime() + return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime()); + } + +-__pid_t gettid() ++pid_t gettid() + { + return syscall(SYS_gettid); + } diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch new file mode 100644 index 000000000..5fa802cb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch @@ -0,0 +1,38 @@ +From 8ebcf5f2dd27dbeb6c81e9c40a5d17916cb243e6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:26:31 -0800 +Subject: [PATCH] heaptrack_inject: Include dlfcn.h for dlopen/dlclose + +Do not use __WORDSIZE which is for libc internal use + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/heaptrack_inject.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp +index 325d87e..fb1c154 100644 +--- a/src/track/heaptrack_inject.cpp ++++ b/src/track/heaptrack_inject.cpp +@@ -28,6 +28,7 @@ + #include <link.h> + #include <malloc.h> + #include <unistd.h> ++#include <dlfcn.h> + + #include <sys/mman.h> + +@@ -39,9 +40,10 @@ + * @brief Experimental support for symbol overloading after runtime injection. + */ + +-#if __WORDSIZE == 64 ++#include <limits.h> ++#if ULONG_MAX == 0xffffffffffffffff + #define ELF_R_SYM(i) ELF64_R_SYM(i) +-#elif __WORDSIZE == 32 ++#elif ULONG_MAX == 0xffffffff + #define ELF_R_SYM(i) ELF32_R_SYM(i) + #else + #error unsupported word size diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch new file mode 100644 index 000000000..c3c852e39 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch @@ -0,0 +1,118 @@ +From b8435c6523d9377f04d5e21629f3dc68b8865016 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:31:45 -0800 +Subject: [PATCH] heaptrack_preload: Make noexcept attribute conditional + +musl does not define these functions with noexcept and hence compiler +complains about them + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/track/heaptrack_preload.cpp | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/src/track/heaptrack_preload.cpp b/src/track/heaptrack_preload.cpp +index 63110ce..ee85331 100644 +--- a/src/track/heaptrack_preload.cpp ++++ b/src/track/heaptrack_preload.cpp +@@ -171,11 +171,17 @@ void init() + } + } + ++#ifdef __GLIBC__ ++#define NOEXECPT noexcept ++#else ++#define NOEXECPT ++#endif ++ + extern "C" { + + /// TODO: memalign, pvalloc, ...? + +-void* malloc(size_t size) noexcept ++void* malloc(size_t size) NOEXECPT + { + if (!hooks::malloc) { + hooks::init(); +@@ -186,7 +192,7 @@ void* malloc(size_t size) noexcept + return ptr; + } + +-void free(void* ptr) noexcept ++void free(void* ptr) NOEXECPT + { + if (!hooks::free) { + hooks::init(); +@@ -204,7 +210,7 @@ void free(void* ptr) noexcept + hooks::free(ptr); + } + +-void* realloc(void* ptr, size_t size) noexcept ++void* realloc(void* ptr, size_t size) NOEXECPT + { + if (!hooks::realloc) { + hooks::init(); +@@ -219,7 +225,7 @@ void* realloc(void* ptr, size_t size) noexcept + return ret; + } + +-void* calloc(size_t num, size_t size) noexcept ++void* calloc(size_t num, size_t size) NOEXECPT + { + if (!hooks::calloc) { + hooks::init(); +@@ -235,7 +241,7 @@ void* calloc(size_t num, size_t size) noexcept + } + + #if HAVE_CFREE +-void cfree(void* ptr) noexcept ++void cfree(void* ptr) NOEXECPT + { + if (!hooks::cfree) { + hooks::init(); +@@ -252,7 +258,7 @@ void cfree(void* ptr) noexcept + } + #endif + +-int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept ++int posix_memalign(void** memptr, size_t alignment, size_t size) NOEXECPT + { + if (!hooks::posix_memalign) { + hooks::init(); +@@ -268,7 +274,7 @@ int posix_memalign(void** memptr, size_t alignment, size_t size) noexcept + } + + #if HAVE_ALIGNED_ALLOC +-void* aligned_alloc(size_t alignment, size_t size) noexcept ++void* aligned_alloc(size_t alignment, size_t size) NOEXECPT + { + if (!hooks::aligned_alloc) { + hooks::init(); +@@ -285,7 +291,7 @@ void* aligned_alloc(size_t alignment, size_t size) noexcept + #endif + + #if HAVE_VALLOC +-void* valloc(size_t size) noexcept ++void* valloc(size_t size) NOEXECPT + { + if (!hooks::valloc) { + hooks::init(); +@@ -301,7 +307,7 @@ void* valloc(size_t size) noexcept + } + #endif + +-void* dlopen(const char* filename, int flag) noexcept ++void* dlopen(const char* filename, int flag) NOEXECPT + { + if (!hooks::dlopen) { + hooks::init(); +@@ -316,7 +322,7 @@ void* dlopen(const char* filename, int flag) noexcept + return ret; + } + +-int dlclose(void* handle) noexcept ++int dlclose(void* handle) NOEXECPT + { + if (!hooks::dlclose) { + hooks::init(); diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch new file mode 100644 index 000000000..3db03cf85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack/0004-backtrace-Always-include-stdint.h.patch @@ -0,0 +1,42 @@ +From 200f71ea8c0756594ac7e079ccc686d9a20cea5c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 23 Nov 2020 15:32:58 -0800 +Subject: [PATCH] backtrace: Always include stdint.h + +in OE we will always have system headers which supports C99/stdint.h + +Upstream-Status: Inappropriate [Unless upstream drops legacy] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 3rdparty/libbacktrace/backtrace.h | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/3rdparty/libbacktrace/backtrace.h b/3rdparty/libbacktrace/backtrace.h +index 14863cf..d0ac38f 100644 +--- a/3rdparty/libbacktrace/backtrace.h ++++ b/3rdparty/libbacktrace/backtrace.h +@@ -36,24 +36,8 @@ POSSIBILITY OF SUCH DAMAGE. */ + #include <stddef.h> + #include <stdio.h> + +-/* We want to get a definition for uintptr_t, but we still care about +- systems that don't have <stdint.h>. */ +-#if defined(__GLIBC__) && __GLIBC__ >= 2 +- +-#include <stdint.h> +- +-#elif defined(HAVE_STDINT_H) +- + #include <stdint.h> + +-#else +- +-/* Systems that don't have <stdint.h> must provide gstdint.h, e.g., +- from GCC_HEADER_STDINT in configure.ac. */ +-#include "gstdint.h" +- +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb new file mode 100644 index 000000000..f2235afef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Heap memory profiler for Linux" +DESCRIPTION = "Heaptrack traces all memory allocations and annotates these \ +events with stack traces. Dedicated analysis tools then allow you to interpret \ +the heap memory profile to find hotspots to reduce memory, leaks, allocation \ +hotspots and temporary allocations" +HOMEPAGE = "https://phabricator.kde.org/source/heaptrack/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "zlib boost libunwind elfutils" + +SRC_URI = "git://github.com/KDE/heaptrack.git;protocol=https \ + file://0001-libheaptrack-Replace-__pid_t-with-pid_t.patch \ + file://0002-heaptrack_inject-Include-dlfcn.h-for-dlopen-dlclose.patch \ + file://0003-heaptrack_preload-Make-noexcept-attribute-conditiona.patch \ + file://0004-backtrace-Always-include-stdint.h.patch \ + " + +SRCREV = "bc9e3744bcc47de978673d1e382f4125a1ab5fa8" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF" + +# libunwind is not yet ported to RISCV +COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST_riscv64 = "null" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb index 7d84ea60b..60c33d658 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb @@ -31,7 +31,7 @@ PACKAGECONFIG ??= "readline" PACKAGECONFIG[readline] = ",,readline" UCLIBC_PATCHES += "file://uclibc-pthread.patch" -SRC_URI_append_libc-uclibc = "${UCLIBC_PATCHES}" +SRC_URI_append_libc-uclibc = " ${UCLIBC_PATCHES}" TARGET_CC_ARCH += " -fPIC ${LDFLAGS}" EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch new file mode 100644 index 000000000..6fee0526d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch @@ -0,0 +1,43 @@ +From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001 +From: Ariadne Conill <ariadne@dereferenced.org> +Date: Sat, 14 Nov 2020 22:55:30 -0700 +Subject: [PATCH] Fix build under GCC -fno-common. + +Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/modules.h | 4 ++-- + src/main.c | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/modules.h b/include/modules.h +index 70c1960..e77ec58 100644 +--- a/include/modules.h ++++ b/include/modules.h +@@ -28,7 +28,7 @@ struct mod_passwd { + link_t link; + }; + +-list_t passwd_mods; +-list_t group_mods; ++extern list_t passwd_mods; ++extern list_t group_mods; + + #endif +diff --git a/src/main.c b/src/main.c +index c1a78bb..808ef74 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -18,6 +18,9 @@ + #include "parse.h" + #include "util.h" + ++list_t passwd_mods; ++list_t group_mods; ++ + static void *get_dll(const char *service) + { + char *path; +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch new file mode 100644 index 000000000..691aa3d2a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch @@ -0,0 +1,29 @@ +From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 22 Nov 2020 12:32:01 -0800 +Subject: [PATCH] configure: Check for flex if lex is not found + +lex is already checked by this time, therefore check should be to find +flex +Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 256824a..4c94568 100755 +--- a/configure ++++ b/configure +@@ -249,7 +249,7 @@ printf "checking for lex... " + trylex ${CROSS_COMPILE}lex + trylex lex + trylex ${CROSS_COMPILE}flex +-trylex lex ++trylex flex + printf "%s\n" "$LEX" + test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source." + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index 374f94409..83125a1ba 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -7,12 +7,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" SECTION = "utils" -PV = "1.0.2" +DEPENDS += "flex-native bison-native flex bison" -CFLAGS += "-fcommon" +PV = "1.0.2" -SRCREV = "8f278675e1b6a3a02c8ee1b8ca000f80570dc5d6" -SRC_URI = "git://github.com/pikhq/musl-nscd" +SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" +SRC_URI = "git://github.com/pikhq/musl-nscd \ + file://0001-Fix-build-under-GCC-fno-common.patch \ + file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ + " UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb index 2e3da7d4d..ed1a719fe 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nanopb/nanopb_0.4.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" DEPENDS = "protobuf-native" SRC_URI = "git://github.com/nanopb/nanopb.git" -SRCREV = "70f0de9877b1ce12abc0229d5df84db6349fcbfc" +SRCREV = "1466e6f953835b191a7f5acf0c06c941d4cd33d9" S = "${WORKDIR}/git" @@ -27,4 +27,3 @@ RDEPENDS_${PN} += "\ BBCLASSEXTEND = "native nativesdk" -PNBLACKLIST[nanopb] ?= "Needs forward porting to use python3" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch new file mode 100644 index 000000000..a23f1c243 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch @@ -0,0 +1,53 @@ +From be8d3cd6eab4b8f9849133060abb1aba4400276b Mon Sep 17 00:00:00 2001 +From: Amy Huang <akhuang@google.com> +Date: Thu, 23 Apr 2020 11:25:53 -0700 +Subject: [PATCH] Remove use of register r7 because llvm now issues an error + when "r7" is used (starting in commit d85b3877) + +Bug: chromium:1073270 +Change-Id: I7ec8112f170b98d2edaf92bc9341e738f8de07a3 +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2163435 +Reviewed-by: Nico Weber <thakis@chromium.org> +Reviewed-by: Ross McIlroy <rmcilroy@chromium.org> +Commit-Queue: Nico Weber <thakis@chromium.org> +Cr-Commit-Position: refs/heads/master@{#67371} +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Backport [https://chromium.googlesource.com/v8/v8/+/00604cd2806b5d26bef592dd19989a234bd07a4b%5E%21/] + deps/v8/src/codegen/arm/cpu-arm.cc | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/deps/v8/src/codegen/arm/cpu-arm.cc b/deps/v8/src/codegen/arm/cpu-arm.cc +index 868f360..654d68f 100644 +--- a/deps/v8/src/codegen/arm/cpu-arm.cc ++++ b/deps/v8/src/codegen/arm/cpu-arm.cc +@@ -30,18 +30,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + register uint32_t end asm("r1") = beg + size; + register uint32_t flg asm("r2") = 0; + +-#ifdef __clang__ +- // This variant of the asm avoids a constant pool entry, which can be +- // problematic when LTO'ing. It is also slightly shorter. +- register uint32_t scno asm("r7") = __ARM_NR_cacheflush; +- +- asm volatile("svc 0\n" +- : +- : "r"(beg), "r"(end), "r"(flg), "r"(scno) +- : "memory"); +-#else +- // Use a different variant of the asm with GCC because some versions doesn't +- // support r7 as an asm input. + asm volatile( + // This assembly works for both ARM and Thumb targets. + +@@ -59,7 +47,6 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, size_t size) { + : "r"(beg), "r"(end), "r"(flg), [scno] "i"(__ARM_NR_cacheflush) + : "memory"); + #endif +-#endif + #endif // !USE_SIMULATOR + } + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb index 8a9f32bce..9d1558623 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.19.0.bb @@ -21,11 +21,12 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ file://mips-warnings.patch \ + file://0001-Remove-use-of-register-r7-because-llvm-now-issues-an.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-binaries.patch \ " -SRC_URI[sha256sum] = "71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e" +SRC_URI[sha256sum] = "3b671c45c493f96d7e018c15110cdbafa4478e5e5cfc9e6eec83cea9e6b551e1" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb index 1ab21d1dc..7b1a8a639 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.15.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42 SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" -SRC_URI[md5sum] = "70bcec4b1b19838ed209fb96a13f3e89" -SRC_URI[sha256sum] = "51f3e4e311128bdb2c6a15f02c51376cb852ccf9df9bebe8dfbb5f9561eb95b5" +SRC_URI[md5sum] = "060103c6d6e4d9833fa7715860f2923b" +SRC_URI[sha256sum] = "43f9cc0f87620bbb159e0890e196b23a8e6419cbd04224c10f3dcee948f6b51a" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb index abd8b1672..1da560783 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.4.9.bb @@ -155,7 +155,6 @@ do_install_prepend_class-target() { # fixme do_install_append_class-target() { install -d ${D}${sysconfdir}/ - rm -rf ${D}/${TMPDIR} rm -rf ${D}/.registry rm -rf ${D}/.channels rm -rf ${D}/.[a-z]* @@ -179,14 +178,6 @@ do_install_append_class-target() { ${D}${systemd_unitdir}/system/php-fpm.service fi - TMP=`dirname ${D}/${TMPDIR}` - while test ${TMP} != ${D}; do - if [ -d ${TMP} ]; then - rmdir ${TMP} - fi - TMP=`dirname ${TMP}`; - done - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb index 8c349db4d..31e3bcc5b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.13.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.14.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "d1eca4e4b421cd2997495c4b4e65cea6be4e9b8a" +SRCREV = "2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch new file mode 100644 index 000000000..c955b5fa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch @@ -0,0 +1,43 @@ +From 83628b471a1a79dae50bb158fca9448b668dd3a6 Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 10:43:16 -0600 +Subject: [PATCH] Preserve CXXFLAGS from environment in Mongoose + +This allows CXXFLAGS set in the environment to also be used in the CMake +build process, instead of overwriting them. This is useful in a cross +compile context where the CXXFLAGS variable might contain necessary +flags for cross compiling. +--- + Mongoose/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt +index 7e134ab..91a7f70 100644 +--- a/Mongoose/CMakeLists.txt ++++ b/Mongoose/CMakeLists.txt +@@ -321,14 +321,14 @@ add_test(Unit_Test_EdgeSep ./tests/mongoose_unit_test_edgesep) + message(STATUS "CMAKE_CXX_COMPILER: " ${BoldBlue} ${CMAKE_CXX_COMPILER_ID} ${ColourReset}) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + # using Clang +- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv") + # Debug flags for Clang + SET(CMAKE_CXX_FLAGS_DEBUG "--coverage -g -fwrapv") + SET(CMAKE_C_FLAGS_DEBUG "--coverage -g") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + # using GCC +- SET(CMAKE_CXX_FLAGS "-O3 -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fwrapv") + # Debug flags for GCC + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +@@ -339,7 +339,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage") + elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + # using Intel C++ +- SET(CMAKE_CXX_FLAGS "-O3 -no-prec-div -xHOST -ipo -fwrapv") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -no-prec-div -xHOST -ipo -fwrapv") + # Debug flags for Intel + SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -fwrapv") + SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall") diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch new file mode 100644 index 000000000..190eaf164 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0002-Preserve-links-when-installing-libmetis.patch @@ -0,0 +1,22 @@ +From 31175fb408a4f5e85e39a9aabd4a29f9d9c1fe25 Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 15:26:52 -0600 +Subject: [PATCH] Preserve links when installing libmetis + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7631955..57fd022 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,7 +76,7 @@ ifeq (,$(MY_METIS_LIB)) + @mkdir -p $(INSTALL_LIB) + @mkdir -p $(INSTALL_INCLUDE) + @mkdir -p $(INSTALL_DOC) +- - $(CP) lib/libmetis.* $(INSTALL_LIB) ++ - $(CP) -d lib/libmetis.* $(INSTALL_LIB) + - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf + - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt + # the following is needed only on the Mac, so *.dylib is hardcoded: diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch new file mode 100644 index 000000000..dee6039a8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse/0003-Add-version-information-to-libmetis.patch @@ -0,0 +1,49 @@ +From 11ab355fdda93b762fcc07ac3f7c6ab1be0a5f5a Mon Sep 17 00:00:00 2001 +From: Gregory Anders <greg@gpanders.com> +Date: Wed, 21 Oct 2020 15:27:07 -0600 +Subject: [PATCH] Add version information to libmetis + +--- + metis-5.1.0/Makefile | 8 ++++---- + metis-5.1.0/libmetis/CMakeLists.txt | 1 + + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/metis-5.1.0/Makefile b/metis-5.1.0/Makefile +index 9cc03b9..c445d85 100644 +--- a/metis-5.1.0/Makefile ++++ b/metis-5.1.0/Makefile +@@ -18,8 +18,11 @@ systype = $(shell uname -s) + + BUILDDIR = build/$(systype)-$(cputype) + ++VERNUM=5.1.0 ++PKGNAME=metis-$(VERNUM) ++ + # Process configuration options. +-CONFIG_FLAGS = ++CONFIG_FLAGS = -DMETIS_VERSION=$(VERNUM) + ifeq ($(gklib_path), not-set) + gklib_path = GKlib + endif +@@ -52,9 +55,6 @@ ifneq ($(cc), not-set) + CONFIG_FLAGS += -DCMAKE_C_COMPILER=$(cc) + endif + +-VERNUM=5.1.0 +-PKGNAME=metis-$(VERNUM) +- + JOBS ?= 1 + + define run-config +diff --git a/metis-5.1.0/libmetis/CMakeLists.txt b/metis-5.1.0/libmetis/CMakeLists.txt +index 120e94d..11bde87 100644 +--- a/metis-5.1.0/libmetis/CMakeLists.txt ++++ b/metis-5.1.0/libmetis/CMakeLists.txt +@@ -4,6 +4,7 @@ include_directories(.) + file(GLOB metis_sources *.c) + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources}) ++set_target_properties(metis PROPERTIES VERSION ${METIS_VERSION}) + if(UNIX) + target_link_libraries(metis m) + endif() diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb new file mode 100644 index 000000000..9ccf2d0bf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb @@ -0,0 +1,80 @@ +LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7" +SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ + file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ + file://0002-Preserve-links-when-installing-libmetis.patch \ + file://0003-Add-version-information-to-libmetis.patch \ + " + +SRC_URI[md5sum] = "c414679bbc9432a3def01b31ad921140" +SRC_URI[sha256sum] = "06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40" + +SRCREV = "v${PV}" + +S = "${WORKDIR}/git" + +DEPENDS = "cmake-native lapack gmp mpfr chrpath-native" + +PROVIDES = "mongoose graphblas" +RPROVIDES_${PN} = "mongoose graphblas" + +# The values of $CC, $CXX, and $LD that Bitbake uses have spaces in them which +# causes problems when the SuiteSparse Makefiles try to pass these values on +# the command line. To get around this problem, set these variables to only the +# program name and prepend the rest of the value onto the corresponding FLAGS +# variable. +CFLAGS_prepend := "${@" ".join(d.getVar('CC', True).split()[1:])} " +export CC := "${@d.getVar('CC', True).split()[0]}" + +CXXFLAGS_prepend := "${@" ".join(d.getVar('CXX', True).split()[1:])} " +export CXX := "${@d.getVar('CXX', True).split()[0]}" + +LDFLAGS_prepend := "${@" ".join(d.getVar('LD', True).split()[1:])} " +export LD := "${@d.getVar('LD', True).split()[0]}" + +export CMAKE_OPTIONS = " \ + -DCMAKE_INSTALL_PREFIX=${D}${prefix} \ + -DCMAKE_INSTALL_LIBDIR=${baselib} \ +" + +do_compile () { + oe_runmake library +} + +do_install () { + oe_runmake prefix=${D}${prefix} INSTALL=${D}${prefix} install + + # Remove runtime paths from shared libraries + for file in ${D}${libdir}/*.so.*; do + if [ ! -L "$file" ]; then + chrpath -d "$file" + fi + done +} + +FILES_${PN} += " \ + ${libdir}/libmongoose.so.* \ + ${libdir}/libgraphblas.so.* \ + ${libdir}/libmetis.so.* \ + ${libdir}/libsuitesparseconfig.so.* \ + ${libdir}/libamd.so.* \ + ${libdir}/libbtf.so.* \ + ${libdir}/libcamd.so.* \ + ${libdir}/libccolamd.so.* \ + ${libdir}/libcolamd.so.* \ + ${libdir}/libcholmod.so.* \ + ${libdir}/libcxsparse.so.* \ + ${libdir}/libldl.so.* \ + ${libdir}/libklu.so.* \ + ${libdir}/libumfpack.so.* \ + ${libdir}/librbio.so.* \ + ${libdir}/libspqr.so.* \ + ${libdir}/libsliplu.so.* \ + ${bindir}/mongoose \ +" + +FILES_${PN}-staticdev += "${libdir}/libmongoose.a" +FILES_${PN}-dev += "${includedir} ${libdir}/*.so" + +EXCLUDE_FROM_WORLD = "1" + |