diff options
14 files changed, 182 insertions, 118 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch index ca1c16b83e..86b454d710 100644 --- a/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch +++ b/meta-networking/recipes-daemons/squid/files/0002-squid-make-squid-conf-tests-run-on-target-device.patch | |||
@@ -7,20 +7,46 @@ Subject: [PATCH] squid: make squid-conf-tests run on target device | |||
7 | * Allow the tests to run on read-only root | 7 | * Allow the tests to run on read-only root |
8 | * Don't overwrite tests with true on success | 8 | * Don't overwrite tests with true on success |
9 | * Change logfile path to /var/log | 9 | * Change logfile path to /var/log |
10 | * skip testHeaders since it's not split to prepare/execute parts | ||
10 | 11 | ||
11 | Upstream-Status: Inappropriate [cross compile specific] | 12 | Upstream-Status: Inappropriate [cross compile specific] |
12 | 13 | ||
13 | Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | 14 | Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> |
14 | 15 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | |
15 | --- | 16 | --- |
16 | test-suite/Makefile.am | 16 ++++++++-------- | 17 | src/TestHeaders.am | 6 +++--- |
17 | test-suite/test-squid-conf.sh | 2 +- | 18 | test-suite/Makefile.am | 26 +++++++++++++------------- |
18 | 2 files changed, 9 insertions(+), 9 deletions(-) | 19 | test-suite/test-squid-conf.sh | 4 ++-- |
20 | 3 files changed, 18 insertions(+), 18 deletions(-) | ||
19 | 21 | ||
22 | diff --git a/src/TestHeaders.am b/src/TestHeaders.am | ||
23 | index 0ed5f56..d668876 100644 | ||
24 | --- a/src/TestHeaders.am | ||
25 | +++ b/src/TestHeaders.am | ||
26 | @@ -14,8 +14,8 @@ EXCLUDE_FROM_HDR_TESTING = | ||
27 | # add an empty target named 'testHeaders' depending on the additional | ||
28 | # headers to test | ||
29 | |||
30 | -testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite/testHeader.cc.in | ||
31 | - $(MAKE) $(^:.h=.hdrtest) && cp $(TRUE) $@ | ||
32 | +testHeaders: $(SOURCES) $(noinst_HEADERS) $(top_srcdir)/test-suite/testHeader.cc.in | ||
33 | + $(MAKE) $(^:.h=.hdrtest) | ||
34 | |||
35 | .h.hdrtest: | ||
36 | @SrcFilePath=`echo $< | $(SED) 's%^$(top_srcdir)/%%'`; \ | ||
37 | @@ -31,5 +31,5 @@ testHeaders: $(SOURCES) $(noinst_HEADERS) $(EXTRA_DIST) $(top_srcdir)/test-suite | ||
38 | then echo "header-test: ok - $$SrcFilePath"; $(RM) "$$TargetFileName.cc" "$$TargetFileName"; \ | ||
39 | else echo "header-test: not ok - $$SrcFilePath"; exit 1; fi | ||
40 | |||
41 | -TESTS += testHeaders | ||
42 | +#TESTS += testHeaders | ||
43 | CLEANFILES += testHeaders | ||
44 | diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am | ||
45 | index 0da5844..0bc381a 100644 | ||
20 | --- a/test-suite/Makefile.am | 46 | --- a/test-suite/Makefile.am |
21 | +++ b/test-suite/Makefile.am | 47 | +++ b/test-suite/Makefile.am |
22 | @@ -21,7 +21,7 @@ LDADD = \ | 48 | @@ -11,7 +11,7 @@ include $(top_srcdir)/src/Common.am |
23 | EXTRA_PROGRAMS = mem_node_test splay | 49 | AM_CPPFLAGS += -I$(srcdir) |
24 | 50 | ||
25 | EXTRA_DIST = \ | 51 | EXTRA_DIST = \ |
26 | - $(srcdir)/squidconf/* \ | 52 | - $(srcdir)/squidconf/* \ |
@@ -28,14 +54,27 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | |||
28 | test-functionality.sh \ | 54 | test-functionality.sh \ |
29 | test-sources.sh \ | 55 | test-sources.sh \ |
30 | test-squid-conf.sh \ | 56 | test-squid-conf.sh \ |
31 | @@ -134,21 +134,21 @@ VirtualDeleteOperator_SOURCES = \ | 57 | @@ -124,37 +124,37 @@ VirtualDeleteOperator_LDADD = \ |
32 | 58 | ||
33 | installcheck-local: squid-conf-tests | 59 | installcheck-local: squid-conf-tests |
34 | 60 | ||
35 | -squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* | 61 | -squid-conf-tests: $(srcdir)/test-squid-conf.sh $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* |
36 | - @failed=0; cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; rm -f $@ || $(TRUE); \ | 62 | - @instructionFiles="$(srcdir)/squidconf/*.conf.instructions"; \ |
37 | +squid-conf-tests: test-squid-conf.sh $(top_builddir)/src/squid.conf.default squidconf/* | 63 | +squid-conf-tests: test-squid-conf.sh $(top_builddir)/src/squid.conf.default squidconf/* |
38 | + @failed=0; cfglist="$(top_builddir)/src/squid.conf.default squidconf/*.conf"; rm -f $@ || $(TRUE); \ | 64 | + @instructionFiles="squidconf/*.conf.instructions"; \ |
65 | for instructionFile in $$instructionFiles; do \ | ||
66 | cfgBasename=`basename $$instructionFile .instructions`; \ | ||
67 | - cfg=$(srcdir)/squidconf/$$cfgBasename; \ | ||
68 | + cfg=squidconf/$$cfgBasename; \ | ||
69 | if ! test -f $$cfg; then \ | ||
70 | echo "FAIL: $$instructionFile has no matching $$cfg"; \ | ||
71 | exit 1; \ | ||
72 | fi; \ | ||
73 | done; \ | ||
74 | failed=0; \ | ||
75 | - cfglist="$(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*.conf"; \ | ||
76 | + cfglist="$(top_builddir)/src/squid.conf.default squidconf/*.conf"; \ | ||
77 | rm -f $@ || $(TRUE); \ | ||
39 | for cfg in $$cfglist ; do \ | 78 | for cfg in $$cfglist ; do \ |
40 | - $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ | 79 | - $(srcdir)/test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ |
41 | + ./test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ | 80 | + ./test-squid-conf.sh $(top_builddir) $(sbindir) $$cfg || \ |
@@ -55,11 +94,30 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | |||
55 | - if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi | 94 | - if test "$$failed" -eq 0; then cp $(TRUE) $@ ; else exit 1; fi |
56 | + exit "$$failed" | 95 | + exit "$$failed" |
57 | 96 | ||
58 | -CLEANFILES += squid-conf-tests squid-stderr.log | 97 | CLEANFILES += \ |
59 | +CLEANFILES += squid-conf-tests /var/log/squid-stderr.log | 98 | squid-conf-tests \ |
99 | - squid-expected-messages \ | ||
100 | - squid-stderr.log \ | ||
101 | - squid-stderr.log.next \ | ||
102 | - squid-stderr.log.unmatched | ||
103 | + /var/log/quid-expected-messages \ | ||
104 | + /var/log/squid-stderr.log \ | ||
105 | + /var/log/squid-stderr.log.next \ | ||
106 | + /var/log/squid-stderr.log.unmatched | ||
107 | diff --git a/test-suite/test-squid-conf.sh b/test-suite/test-squid-conf.sh | ||
108 | index 413a927..f678c5a 100755 | ||
60 | --- a/test-suite/test-squid-conf.sh | 109 | --- a/test-suite/test-squid-conf.sh |
61 | +++ b/test-suite/test-squid-conf.sh | 110 | +++ b/test-suite/test-squid-conf.sh |
62 | @@ -111,7 +111,7 @@ then | 111 | @@ -76,7 +76,7 @@ expectMessages() |
112 | exit 1 | ||
113 | fi | ||
114 | |||
115 | - messageRegexFilename="squid-expected-messages" | ||
116 | + messageRegexFilename="/var/log/squid-expected-messages" | ||
117 | if ! :> $messageRegexFilename | ||
118 | then | ||
119 | echo "$where: ERROR: Cannot create a temporary file named $messageRegexFilename" | ||
120 | @@ -241,7 +241,7 @@ then | ||
63 | done < $instructionsFile | 121 | done < $instructionsFile |
64 | fi | 122 | fi |
65 | 123 | ||
diff --git a/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch b/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch new file mode 100644 index 0000000000..26a3896625 --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/CVE-2025-59362.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 0d89165ee6da10e6fa50c44998b3cd16d59400e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Rousskov <rousskov@measurement-factory.com> | ||
3 | Date: Sat, 30 Aug 2025 06:49:36 +0000 | ||
4 | Subject: [PATCH] Fix ASN.1 encoding of long SNMP OIDs (#2149) | ||
5 | |||
6 | CVE: CVE-2025-59362 | ||
7 | Upstream-Status: Backport [https://github.com/squid-cache/squid/commit/0d89165ee6da10e6fa50c44998b3cd16d59400e9] | ||
8 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
9 | --- | ||
10 | lib/snmplib/asn1.c | 13 +++++++++++++ | ||
11 | 1 file changed, 13 insertions(+) | ||
12 | |||
13 | diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c | ||
14 | index 81f2051fb..2852c26b2 100644 | ||
15 | --- a/lib/snmplib/asn1.c | ||
16 | +++ b/lib/snmplib/asn1.c | ||
17 | @@ -735,6 +735,7 @@ asn_build_objid(u_char * data, int *datalength, | ||
18 | * lastbyte ::= 0 7bitvalue | ||
19 | */ | ||
20 | u_char buf[MAX_OID_LEN]; | ||
21 | + u_char *bufEnd = buf + sizeof(buf); | ||
22 | u_char *bp = buf; | ||
23 | oid *op = objid; | ||
24 | int asnlength; | ||
25 | @@ -753,6 +754,10 @@ asn_build_objid(u_char * data, int *datalength, | ||
26 | while (objidlength-- > 0) { | ||
27 | subid = *op++; | ||
28 | if (subid < 127) { /* off by one? */ | ||
29 | + if (bp >= bufEnd) { | ||
30 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
31 | + return (NULL); | ||
32 | + } | ||
33 | *bp++ = subid; | ||
34 | } else { | ||
35 | mask = 0x7F; /* handle subid == 0 case */ | ||
36 | @@ -770,8 +775,16 @@ asn_build_objid(u_char * data, int *datalength, | ||
37 | /* fix a mask that got truncated above */ | ||
38 | if (mask == 0x1E00000) | ||
39 | mask = 0xFE00000; | ||
40 | + if (bp >= bufEnd) { | ||
41 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
42 | + return (NULL); | ||
43 | + } | ||
44 | *bp++ = (u_char) (((subid & mask) >> bits) | ASN_BIT8); | ||
45 | } | ||
46 | + if (bp >= bufEnd) { | ||
47 | + snmp_set_api_error(SNMPERR_ASN_ENCODE); | ||
48 | + return (NULL); | ||
49 | + } | ||
50 | *bp++ = (u_char) (subid & mask); | ||
51 | } | ||
52 | } | ||
diff --git a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch index 18bc78e6be..f80d37de20 100644 --- a/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch +++ b/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch | |||
@@ -16,11 +16,13 @@ Upstream-Status: Pending | |||
16 | configure.ac | 1 + | 16 | configure.ac | 1 + |
17 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
18 | 18 | ||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index c7312d8..3b0e9e2 100644 | ||
19 | --- a/configure.ac | 21 | --- a/configure.ac |
20 | +++ b/configure.ac | 22 | +++ b/configure.ac |
21 | @@ -29,6 +29,7 @@ m4_include([acinclude/tdb.m4]) | 23 | @@ -29,6 +29,7 @@ m4_include([acinclude/lib-checks.m4]) |
22 | m4_include([acinclude/lib-checks.m4]) | ||
23 | m4_include([acinclude/ax_cxx_compile_stdcxx.m4]) | 24 | m4_include([acinclude/ax_cxx_compile_stdcxx.m4]) |
25 | m4_include([acinclude/win32-sspi.m4]) | ||
24 | 26 | ||
25 | +HOSTCXX="$BUILD_CXX" | 27 | +HOSTCXX="$BUILD_CXX" |
26 | PRESET_CFLAGS="$CFLAGS" | 28 | PRESET_CFLAGS="$CFLAGS" |
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index 489850e3bd..8522a299c1 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | |||
@@ -16,10 +16,12 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
16 | acinclude/lib-checks.m4 | 8 ++++++-- | 16 | acinclude/lib-checks.m4 | 8 ++++++-- |
17 | 2 files changed, 15 insertions(+), 3 deletions(-) | 17 | 2 files changed, 15 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 | ||
20 | index e0286fa..b3e4bc7 100644 | ||
19 | --- a/acinclude/krb5.m4 | 21 | --- a/acinclude/krb5.m4 |
20 | +++ b/acinclude/krb5.m4 | 22 | +++ b/acinclude/krb5.m4 |
21 | @@ -57,7 +57,15 @@ main(void) | 23 | @@ -98,7 +98,15 @@ main(void) |
22 | 24 | krb5_init_context(&context); | |
23 | return 0; | 25 | return 0; |
24 | } | 26 | } |
25 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) | 27 | -]])], [ squid_cv_broken_heimdal_krb5_h=yes ], [ squid_cv_broken_heimdal_krb5_h=no ]) |
@@ -35,6 +37,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
35 | ]) | 37 | ]) |
36 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) | 38 | SQUID_STATE_ROLLBACK(squid_krb5_heimdal_test) |
37 | ]) | 39 | ]) |
40 | diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 | ||
41 | index 9793b9a..4f2dc83 100644 | ||
38 | --- a/acinclude/lib-checks.m4 | 42 | --- a/acinclude/lib-checks.m4 |
39 | +++ b/acinclude/lib-checks.m4 | 43 | +++ b/acinclude/lib-checks.m4 |
40 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ | 44 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ |
diff --git a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 5df006038b..d57ebe7869 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch | |||
@@ -14,6 +14,8 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
14 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 3b0e9e2..c730212 100644 | ||
17 | --- a/configure.ac | 19 | --- a/configure.ac |
18 | +++ b/configure.ac | 20 | +++ b/configure.ac |
19 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) | 21 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) |
diff --git a/meta-networking/recipes-daemons/squid/squid_6.12.bb b/meta-networking/recipes-daemons/squid/squid_7.1.bb index 87144fb049..bba26cc5fa 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.12.bb +++ b/meta-networking/recipes-daemons/squid/squid_7.1.bb | |||
@@ -9,10 +9,9 @@ HOMEPAGE = "http://www.squid-cache.org" | |||
9 | SECTION = "web" | 9 | SECTION = "web" |
10 | LICENSE = "GPL-2.0-or-later" | 10 | LICENSE = "GPL-2.0-or-later" |
11 | 11 | ||
12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" | 12 | PV_U = "${@d.getVar('PV').replace('.', '_')}" |
13 | MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
14 | 13 | ||
15 | SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | 14 | SRC_URI = "https://github.com/squid-cache/${BPN}/releases/download/SQUID_${PV_U}/${BPN}-${PV}.tar.xz \ |
16 | file://Set-up-for-cross-compilation.patch \ | 15 | file://Set-up-for-cross-compilation.patch \ |
17 | file://Skip-AC_RUN_IFELSE-tests.patch \ | 16 | file://Skip-AC_RUN_IFELSE-tests.patch \ |
18 | file://squid-use-serial-tests-config-needed-by-ptest.patch \ | 17 | file://squid-use-serial-tests-config-needed-by-ptest.patch \ |
@@ -21,13 +20,18 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
21 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ | 20 | file://0002-squid-make-squid-conf-tests-run-on-target-device.patch \ |
22 | file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \ | 21 | file://0001-libltdl-remove-reference-to-nonexisting-directory.patch \ |
23 | file://squid.nm \ | 22 | file://squid.nm \ |
23 | file://CVE-2025-59362.patch \ | ||
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "f3df3abb2603a513266f24a5d4699a9f0d76b9f554d1848b67f9c51cd3b3cb50" | 26 | SRC_URI[sha256sum] = "763b5a78561cedc4e47634fa42b8e6b8d46c87c949a151b4e7ac2396d2f97dea" |
27 | 27 | ||
28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 28 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
29 | file://errors/COPYRIGHT;md5=6fbb6a2adc362e206da7b4f42846cdec \ | 29 | file://errors/COPYRIGHT;md5=c2a0e15750d3a9743af9109fecc05622 \ |
30 | " | 30 | " |
31 | |||
32 | UPSTREAM_CHECK_URI = "https://github.com/squid-cache/${BPN}/releases/" | ||
33 | UPSTREAM_CHECK_REGEX = "v?(?P<pver>\d+(\.\d+)+)" | ||
34 | |||
31 | DEPENDS = "libtool" | 35 | DEPENDS = "libtool" |
32 | 36 | ||
33 | inherit autotools pkgconfig useradd ptest perlnative systemd | 37 | inherit autotools pkgconfig useradd ptest perlnative systemd |
diff --git a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb index a601d88e7c..178f273ae6 100644 --- a/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb +++ b/meta-oe/recipes-crypto/monocypher/monocypher_4.0.2.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.md;md5=ff30a1c41dfd9e6fa559a9e45ee98302" | |||
9 | SRC_URI = "https://monocypher.org/download/${BPN}-${PV}.tar.gz" | 9 | SRC_URI = "https://monocypher.org/download/${BPN}-${PV}.tar.gz" |
10 | SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34807f1d7b32331d8ff8a1aeb369e946f3769021e03e63efac25b82efc5abf54dc084714" | 10 | SRC_URI[sha512sum] = "bf275d4c53ff94af6cdc723a4e002e9f080f4d1436c86c76bb37870b34807f1d7b32331d8ff8a1aeb369e946f3769021e03e63efac25b82efc5abf54dc084714" |
11 | 11 | ||
12 | MIRRORS = "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz " | 12 | MIRRORS =+ "https://.*/.* https://github.com/LoupVaillant/Monocypher/releases/download/${PV}/${BPN}-${PV}.tar.gz" |
13 | 13 | ||
14 | S = "${UNPACKDIR}/${BPN}-${PV}" | 14 | S = "${UNPACKDIR}/${BPN}-${PV}" |
15 | 15 | ||
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb index 512a63549e..73594fc09f 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.14.0.bb | |||
@@ -22,4 +22,14 @@ EXTRA_OECMAKE += "\ | |||
22 | -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ | 22 | -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ |
23 | " | 23 | " |
24 | 24 | ||
25 | do_install:append() { | ||
26 | sed -i -e 's;^#ifndef.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED$;#ifndef GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED;g' ${B}/generated_src/mscgen_language.hpp | ||
27 | sed -i -e 's;^# define.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED$;# define GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED;g' ${B}/generated_src/mscgen_language.hpp | ||
28 | sed -i -e 's;^#endif.*GENERATED_SRC_MSCGEN_LANGUAGE_HPP_INCLUDED.*$;#endif;g' ${B}/generated_src/mscgen_language.hpp | ||
29 | |||
30 | sed -i -e 's;^#ifndef.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED$;#ifndef GENERATED_SRC_CE_PARSE_HPP_INCLUDED;g' ${B}/generated_src/ce_parse.hpp | ||
31 | sed -i -e 's;^# define.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED$;# define GENERATED_SRC_CE_PARSE_HPP_INCLUDED;g' ${B}/generated_src/ce_parse.hpp | ||
32 | sed -i -e 's;^#endif.*GENERATED_SRC_CE_PARSE_HPP_INCLUDED.*$;#endif;g' ${B}/generated_src/ce_parse.hpp | ||
33 | } | ||
34 | |||
25 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index b0c509988c..fd95c9b84a 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb | |||
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" | |||
4 | DEPENDS = "libusb-compat libftdi" | 4 | DEPENDS = "libusb-compat libftdi" |
5 | RDEPENDS:${PN} = "libusb1" | 5 | RDEPENDS:${PN} = "libusb1" |
6 | 6 | ||
7 | MIRRORS += " \ | ||
8 | git://repo.or.cz/openocd.git git://github.com/openocd-org/openocd.git \ | ||
9 | " | ||
10 | |||
7 | SRC_URI = " \ | 11 | SRC_URI = " \ |
8 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ | 12 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ |
9 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ | 13 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ |
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb index 48e6971d1a..e4078d6862 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb | |||
@@ -35,7 +35,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss | |||
35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" | 35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" |
36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" | 36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" |
37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" | 37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" |
38 | PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart" | 38 | PACKAGECONFIG[smart] = "--with-smart --with-drivedb=${RECIPE_SYSROOT}${datadir}/smartmontools,--without-smart,libatasmart smartmontools" |
39 | PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools" | 39 | PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools" |
40 | 40 | ||
41 | export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs" | 41 | export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs" |
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 16b15f745e..80b5cd527e 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | |||
@@ -24,8 +24,10 @@ SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc7 | |||
24 | inherit cmake | 24 | inherit cmake |
25 | 25 | ||
26 | DEPENDS = "libcap file bzip2" | 26 | DEPENDS = "libcap file bzip2" |
27 | RDEPENDS:dirsplit = "perl" | ||
28 | 27 | ||
28 | EXTRA_OECMAKE = "-DCMAKE_SKIP_BUILD_RPATH=ON" | ||
29 | |||
30 | RDEPENDS:dirsplit = "perl" | ||
29 | RDEPENDS:${PN}-dev = "" | 31 | RDEPENDS:${PN}-dev = "" |
30 | 32 | ||
31 | PACKAGES =+ "dirsplit genisoimage icedax wodim" | 33 | PACKAGES =+ "dirsplit genisoimage icedax wodim" |
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch deleted file mode 100644 index 84b5a4da9f..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 | ||
2 | From: Antonio Sanchez <cantonios@google.com> | ||
3 | Date: Tue, 14 Sep 2021 10:57:22 -0700 | ||
4 | Subject: [PATCH] Default eigen_packet_wrapper constructor. | ||
5 | |||
6 | This makes it trivial, allowing use of `memcpy`. | ||
7 | |||
8 | Fixes #2326 | ||
9 | |||
10 | Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | |||
13 | * fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) | ||
14 | for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, | ||
15 | prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: | ||
16 | |||
17 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, | ||
18 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
19 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
20 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
21 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
22 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': | ||
23 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] | ||
24 | 1671 | memcpy(&res, from, sizeof(Packet4c)); | ||
25 | | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
26 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, | ||
27 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
28 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
29 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
30 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
31 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here | ||
32 | 159 | struct eigen_packet_wrapper | ||
33 | | ^~~~~~~~~~~~~~~~~~~~ | ||
34 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, | ||
35 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
36 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
37 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
38 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
39 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': | ||
40 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] | ||
41 | 1716 | memcpy(&res, from, sizeof(Packet4c)); | ||
42 | | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
43 | In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, | ||
44 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, | ||
45 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, | ||
46 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, | ||
47 | from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: | ||
48 | /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here | ||
49 | 159 | struct eigen_packet_wrapper | ||
50 | | ^~~~~~~~~~~~~~~~~~~~ | ||
51 | cc1plus: all warnings being treated as errors | ||
52 | |||
53 | --- | ||
54 | Eigen/src/Core/GenericPacketMath.h | 2 +- | ||
55 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
56 | |||
57 | diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h | ||
58 | index 8f8f64f15..72234288e 100644 | ||
59 | --- a/Eigen/src/Core/GenericPacketMath.h | ||
60 | +++ b/Eigen/src/Core/GenericPacketMath.h | ||
61 | @@ -162,7 +162,7 @@ struct eigen_packet_wrapper | ||
62 | { | ||
63 | EIGEN_ALWAYS_INLINE operator T&() { return m_val; } | ||
64 | EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } | ||
65 | - EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} | ||
66 | + EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; | ||
67 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} | ||
68 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { | ||
69 | m_val = v; | ||
70 | -- | ||
71 | 2.17.1 | ||
72 | |||
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Remove-LGPL-Code-and-references.patch index 2d19bc23c8..697f3dfa82 100644 --- a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Remove-LGPL-Code-and-references.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e63a6950dbebf4dd95e5c74c423c06fd65df5182 Mon Sep 17 00:00:00 2001 | 1 | From 5e7b53a3268e7cdc81e358825a8c84f06289866c Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> | 2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> |
3 | Date: Wed, 8 Feb 2023 01:25:06 +0000 | 3 | Date: Wed, 8 Feb 2023 01:25:06 +0000 |
4 | Subject: [PATCH] Remove LGPL Code and references. | 4 | Subject: [PATCH] Remove LGPL Code and references. |
@@ -12,12 +12,11 @@ Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/e256ad1823 | |||
12 | bench/tensors/eigen_sycl_bench.sh | 1 - | 12 | bench/tensors/eigen_sycl_bench.sh | 1 - |
13 | bench/tensors/eigen_sycl_bench_contract.sh | 2 +- | 13 | bench/tensors/eigen_sycl_bench_contract.sh | 2 +- |
14 | doc/PreprocessorDirectives.dox | 3 - | 14 | doc/PreprocessorDirectives.dox | 3 - |
15 | test/CMakeLists.txt | 1 - | ||
16 | test/mpl2only.cpp | 24 - | 15 | test/mpl2only.cpp | 24 - |
17 | unsupported/Eigen/IterativeSolvers | 6 - | 16 | unsupported/Eigen/IterativeSolvers | 6 - |
18 | .../IterativeSolvers/ConstrainedConjGrad.h | 187 ------- | 17 | .../IterativeSolvers/ConstrainedConjGrad.h | 187 ------- |
19 | .../IterativeSolvers/IterationController.h | 154 ------ | 18 | .../IterativeSolvers/IterationController.h | 154 ------ |
20 | 12 files changed, 4 insertions(+), 898 deletions(-) | 19 | 11 files changed, 4 insertions(+), 897 deletions(-) |
21 | delete mode 100644 COPYING.LGPL | 20 | delete mode 100644 COPYING.LGPL |
22 | delete mode 100644 Eigen/src/Core/util/NonMPL2.h | 21 | delete mode 100644 Eigen/src/Core/util/NonMPL2.h |
23 | delete mode 100644 test/mpl2only.cpp | 22 | delete mode 100644 test/mpl2only.cpp |
@@ -567,7 +566,7 @@ index 1af67cf18..000000000 | |||
567 | -#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode | 566 | -#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode |
568 | -#endif | 567 | -#endif |
569 | diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 568 | diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
570 | index 7803fd817..1a5d7faeb 100644 | 569 | index 5e632c4e2..8b6077601 100644 |
571 | --- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 570 | --- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
572 | +++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h | 571 | +++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h |
573 | @@ -24,8 +24,7 @@ namespace Eigen { | 572 | @@ -24,8 +24,7 @@ namespace Eigen { |
@@ -606,7 +605,7 @@ index 73fd6c4a0..3ab0138a1 100644 | |||
606 | ./tensor_contract_sycl_bench | 605 | ./tensor_contract_sycl_bench |
607 | 606 | ||
608 | diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox | 607 | diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox |
609 | index 0f545b086..b7d59ccbc 100644 | 608 | index eda0d1961..2b5cb1b92 100644 |
610 | --- a/doc/PreprocessorDirectives.dox | 609 | --- a/doc/PreprocessorDirectives.dox |
611 | +++ b/doc/PreprocessorDirectives.dox | 610 | +++ b/doc/PreprocessorDirectives.dox |
612 | @@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off. | 611 | @@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off. |
@@ -619,18 +618,6 @@ index 0f545b086..b7d59ccbc 100644 | |||
619 | 618 | ||
620 | \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking | 619 | \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking |
621 | 620 | ||
622 | diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt | ||
623 | index 5136f82aa..9f557743a 100644 | ||
624 | --- a/test/CMakeLists.txt | ||
625 | +++ b/test/CMakeLists.txt | ||
626 | @@ -277,7 +277,6 @@ ei_add_test(special_numbers) | ||
627 | ei_add_test(rvalue_types) | ||
628 | ei_add_test(dense_storage) | ||
629 | ei_add_test(ctorleak) | ||
630 | -ei_add_test(mpl2only) | ||
631 | ei_add_test(inplace_decomposition) | ||
632 | ei_add_test(half_float) | ||
633 | ei_add_test(bfloat16_float) | ||
634 | diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp | 621 | diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp |
635 | deleted file mode 100644 | 622 | deleted file mode 100644 |
636 | index 296350d08..000000000 | 623 | index 296350d08..000000000 |
@@ -662,11 +649,11 @@ index 296350d08..000000000 | |||
662 | - return 0; | 649 | - return 0; |
663 | -} | 650 | -} |
664 | diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers | 651 | diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers |
665 | index a3f58d676..f045fb607 100644 | 652 | index b53f10937..3ac64e9f8 100644 |
666 | --- a/unsupported/Eigen/IterativeSolvers | 653 | --- a/unsupported/Eigen/IterativeSolvers |
667 | +++ b/unsupported/Eigen/IterativeSolvers | 654 | +++ b/unsupported/Eigen/IterativeSolvers |
668 | @@ -19,7 +19,6 @@ | 655 | @@ -19,7 +19,6 @@ |
669 | * \defgroup IterativeLinearSolvers_Module Iterative solvers module | 656 | * \defgroup IterativeLinearSolvers_Module IterativeLinearSolvers module |
670 | * This module aims to provide various iterative linear and non linear solver algorithms. | 657 | * This module aims to provide various iterative linear and non linear solver algorithms. |
671 | * It currently provides: | 658 | * It currently provides: |
672 | - * - a constrained conjugate gradient | 659 | - * - a constrained conjugate gradient |
@@ -1038,3 +1025,6 @@ index a116e09e2..000000000 | |||
1038 | -} // end namespace Eigen | 1025 | -} // end namespace Eigen |
1039 | - | 1026 | - |
1040 | -#endif // EIGEN_ITERATION_CONTROLLER_H | 1027 | -#endif // EIGEN_ITERATION_CONTROLLER_H |
1028 | -- | ||
1029 | 2.48.1 | ||
1030 | |||
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb index f5f874941a..c5421e4621 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb | |||
@@ -13,15 +13,23 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ | |||
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ | 15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ |
16 | file://0001-Default-eigen_packet_wrapper-constructor.patch \ | 16 | file://0001-Remove-LGPL-Code-and-references.patch \ |
17 | file://0002-Remove-LGPL-Code-and-references.patch \ | ||
18 | " | 17 | " |
19 | 18 | ||
20 | SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" | 19 | SRCREV = "d71c30c47858effcbd39967097a2d99ee48db464" |
21 | 20 | ||
22 | 21 | ||
23 | inherit cmake | 22 | inherit cmake |
24 | 23 | ||
24 | PACKAGECONFIG ??= "" | ||
25 | |||
26 | PACKAGECONFIG[blas] = "-DEIGEN_BUILD_BLAS=ON,-DEIGEN_BUILD_BLAS=OFF,libgfortran" | ||
27 | PACKAGECONFIG[lapack] = "-DEIGEN_BUILD_LAPACK=ON,-DEIGEN_BUILD_LAPACK=OFF,libgfortran" | ||
28 | |||
29 | EXTRA_OECMAKE += " \ | ||
30 | -DEIGEN_BUILD_TESTING=OFF \ | ||
31 | " | ||
32 | |||
25 | FILES:${PN}-dev += "${datadir}/eigen3/cmake" | 33 | FILES:${PN}-dev += "${datadir}/eigen3/cmake" |
26 | 34 | ||
27 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 35 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |