package/qpid-proton: bump to version 0.35.0
PATCH 1/1 package/qpid-proton: bump to version 0.35.0
- Drop patches (already in version)
- host-python3 is mandatory since
https://github.com/apache/qpid-proton/commit/70ace037684f39c2d68681ef32302d38a9e06fac
https://qpid.apache.org/releases/qpid-proton-0.35.0/release-notes.html
https://qpid.apache.org/releases/qpid-proton-0.34.0/release-notes.html
--- ...r-epoll-internal.h-fix-build-on-musl.patch | 43 ------------- ...N-2355-Fix-build-with-DPROACTOR-none.patch | 61 ------------------- package/qpid-proton/qpid-proton.hash | 4 +- package/qpid-proton/qpid-proton.mk | 6 +- 4 files changed, 5 insertions(+), 109 deletions(-) delete mode 100644 package/qpid-proton/0001-c-src-proactor-epoll-internal.h-fix-build-on-musl.patch delete mode 100644 package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch
package/qpid-proton/0001-c-src-proactor-epoll-internal.h-fix-build-on-musl.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From e4211aa978606b9201dc0eb2399d1af6c010a46a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Wed, 17 Mar 2021 17:21:52 +0100 -Subject: [PATCH] c/src/proactor/epoll-internal.h: fix build on musl - -Build with epoll proactor on musl is broken since at least version 0.23.0 and -https://github.com/apache/qpid-proton/commit/37136940e3077f25ce58c94775f48c66f666f4a8 -because musl does not define PTHREAD_MUTEX_ADAPTIVE_NP resulting in the -following build failure: - -In file included from /home/giuliobenetti/autobuild/run/instance-0/output-1/build/qpid-proton-0.33.0/c/src/proactor/epoll.c:60: -/home/giuliobenetti/autobuild/run/instance-0/output-1/build/qpid-proton-0.33.0/c/src/proactor/epoll-internal.h: In function 'pmutex_init': -/home/giuliobenetti/autobuild/run/instance-0/output-1/build/qpid-proton-0.33.0/c/src/proactor/epoll-internal.h:319:36: error: 'PTHREAD_MUTEX_ADAPTIVE_NP' undeclared (first use in this function); did you mean 'PTHREAD_MUTEX_STALLED'? - 319 | pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); - | ^~~~~~~~~~~~~~~~~~~~~~~~~ - | PTHREAD_MUTEX_STALLED - -Fixes: - - http://autobuild.buildroot.org/results/6a901b9ff68b7f52cabf8273d1017025fbd93b0d - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://issues.apache.org/jira/browse/PROTON-2346] ---- - c/src/proactor/epoll-internal.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/c/src/proactor/epoll-internal.h b/c/src/proactor/epoll-internal.h -index e8c9f0a9..fa6a6f2a 100644 ---- a/c/src/proactor/epoll-internal.h -+++ b/c/src/proactor/epoll-internal.h -@@ -315,7 +315,9 @@ static inline void pmutex_init(pthread_mutex_t *pm){ - pthread_mutexattr_t attr; - - pthread_mutexattr_init(&attr); -+#ifdef PTHREAD_MUTEX_ADAPTIVE_NP - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP); -+#endif - if (pthread_mutex_init(pm, &attr)) { - perror("pthread failure"); - abort(); --- -2.30.1 -
package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch deleted +0 -61
61 lines not on this page · raw message
package/qpid-proton/qpid-proton.hash +2 -2
@@ -1,5 +1,5 @@ -# Hash from: https://www.apache.org/dist/qpid/proton/0.33.0/qpid-proton-0.33.0.tar.gz.sha512 -sha512 d82cade354fd01f2cf7a3e0c17d48cdfa3bde263c8571762cdeb0b4da6ef2d6fd6f97cdba4fa4e8fc1b5368c54ccd2ca860fb56f46f58091c91deab843a17cf2 qpid-proton-0.33.0.tar.gz +# Hash from: https://www.apache.org/dist/qpid/proton/0.35.0/qpid-proton-0.35.0.tar.gz.sha512 +sha512 1031e3d45854107a516699e1d18269c6acb22549b2709c1fc1cd25eb870096de109077445f1b400edf231bb21a476a268e2d6674e986fc50e92a281549085543 qpid-proton-0.35.0.tar.gz # Locally computed sha256 52310e65489d30afeefc8589479fc02862a875349c19edd165658a915009da82 LICENSE.txt
package/qpid-proton/qpid-proton.mk +3 -3
@@ -4,7 +4,7 @@ # ################################################################################ -QPID_PROTON_VERSION = 0.33.0 +QPID_PROTON_VERSION = 0.35.0 QPID_PROTON_SITE = \ https://downloads.apache.org/qpid/proton/$(QPID_PROTON_VERSION) QPID_PROTON_LICENSE = Apache-2.0
@@ -13,7 +13,7 @@ QPID_PROTON_CPE_ID_VENDOR = apache QPID_PROTON_CPE_ID_PRODUCT = qpid_proton QPID_PROTON_INSTALL_STAGING = YES QPID_PROTON_DEPENDENCIES = \ - host-python \ + host-python3 \ util-linux \ $(if $(BR2_PACKAGE_LIBUV),libuv) \ $(if $(BR2_PACKAGE_OPENSSL),openssl)
@@ -29,7 +29,7 @@ QPID_PROTON_CONF_OPTS = \ -DENABLE_FUZZ_TESTING=OFF \ -DENABLE_VALGRIND=OFF \ -DENABLE_WARNING_ERROR=OFF \ - -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2 + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 # epoll proactor unconditionally uses pthread and cpp (C++) bindings # unconditionally use proactor
Signature · 1 line
2.30.2
Thomas Petazzoni
AppliedPATCH 1/1 package/qpid-proton: bump to version 0.35.0
Quoted 8 lines · On Sat, 10 Jul 2021 16:21:35 +0200 Fabrice Fontaine…
- Drop patches (already in version)
- host-python3 is mandatory since
https://github.com/apache/qpid-proton/commit/70ace037684f39c2d68681ef32302d38a9e06fachttps://qpid.apache.org/releases/qpid-proton-0.35.0/release-notes.html
https://qpid.apache.org/releases/qpid-proton-0.34.0/release-notes.htmlSigned-off-by Fabrice Fontaine <[email protected]>
Quoted 8 lines
--- ...r-epoll-internal.h-fix-build-on-musl.patch | 43 ------------- ...N-2355-Fix-build-with-DPROACTOR-none.patch | 61 ------------------- package/qpid-proton/qpid-proton.hash | 4 +- package/qpid-proton/qpid-proton.mk | 6 +- 4 files changed, 5 insertions(+), 109 deletions(-) delete mode 100644 package/qpid-proton/0001-c-src-proactor-epoll-internal.h-fix-build-on-musl.patch delete mode 100644 package/qpid-proton/0002-PROTON-2355-Fix-build-with-DPROACTOR-none.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com