package/openpgm: bump to version 5-3-128
PATCH v2 1/3 package/openpgm: bump to version 5-3-128
- Drop first patch (not needed since
https://github.com/steve-o/openpgm/commit/e2ff9cf32df5a9037e956a6be1afe75391b1941d)
- Drop second and third patch (already in version)
---
Changes v1 -> v2:
- Update zeromq package
.../0001-Rename-openpgm-5.2.pc.in.patch | 57 +++++++++++++++++++ ...nerator.py-make-it-python3-compliant.patch | 42 -------------- package/openpgm/0002-cross-compile.patch | 38 ------------- ...includes-to-fix-build-with-musl-libc.patch | 55 ------------------ package/openpgm/openpgm.hash | 2 +- package/openpgm/openpgm.mk | 2 +- 6 files changed, 59 insertions(+), 137 deletions(-) create mode 100644 package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch delete mode 100644 package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch delete mode 100644 package/openpgm/0002-cross-compile.patch delete mode 100644 package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch
package/openpgm/0001-Rename-openpgm-5.2.pc.in.patch new file +57 -0
@@ -0,0 +1,57 @@ +From 240634b1afb968a051f8c68696eae2a582a02450 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Mon, 31 Aug 2020 20:16:25 +0200 +Subject: [PATCH] Rename openpgm-5.2.pc.in + +This will fix the following build failure: + +config.status: error: cannot find input file: `openpgm-5.3.pc.in' + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/steve-o/openpgm/pull/66] +--- + openpgm/pgm/openpgm-5.2.pc.in | 12 ------------ + openpgm/pgm/openpgm-5.3.pc.in | 12 ++++++++++++ + 2 files changed, 12 insertions(+), 12 deletions(-) + delete mode 100644 openpgm/pgm/openpgm-5.2.pc.in + create mode 100644 openpgm/pgm/openpgm-5.3.pc.in + +diff --git a/openpgm/pgm/openpgm-5.2.pc.in b/openpgm/pgm/openpgm-5.2.pc.in +deleted file mode 100644 +index 9e30a6d..0000000 +--- a/openpgm/pgm/openpgm-5.2.pc.in ++++ /dev/null +@@ -1,12 +0,0 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +- +-Name: OpenPGM +-Description: PGM Protocol Library. +-Version: @PACKAGE_VERSION@ +-# packagers may wish to move @LIBS@ to Libs.private for platforms with +-# versions of pkg-config that support static linking. +-Libs: -L${libdir} -lpgm @LIBS@ +-Cflags: -I${includedir}/pgm- at VERSION_MAJOR@. at VERSION_MINOR@ +diff --git a/openpgm/pgm/openpgm-5.3.pc.in b/openpgm/pgm/openpgm-5.3.pc.in +new file mode 100644 +index 0000000..9e30a6d +--- /dev/null ++++ b/openpgm/pgm/openpgm-5.3.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: OpenPGM ++Description: PGM Protocol Library. ++Version: @PACKAGE_VERSION@ ++# packagers may wish to move @LIBS@ to Libs.private for platforms with ++# versions of pkg-config that support static linking. ++Libs: -L${libdir} -lpgm @LIBS@ ++Cflags: -I${includedir}/pgm- at VERSION_MAJOR@. at VERSION_MINOR@ +-- +2.28.0 +
package/openpgm/0001-version_generator.py-make-it-python3-compliant.patch deleted +0 -42
42 lines not on this page · raw message
package/openpgm/0002-cross-compile.patch deleted +0 -38
@@ -1,38 +0,0 @@ -configure.ac: cross-compilation fix - -This patch enables to configure the package when cross-compiling in a way -recommended by Autoconf manual (see manual for version 2.69, Section 6.6 -Checking Runtime Behavior). - -Signed-off-by: Alexander Lukichev <[email protected]> - ---- a/openpgm/pgm/configure.ac 2011-09-27 20:59:08.000000000 +0300 -+++ b/openpgm/pgm/configure.ac 2013-02-12 10:33:53.000000000 +0200 -@@ -272,14 +272,19 @@ uint32_t add32_with_carry (uint32_t a, u - ;; - esac - # ticket spinlock friendly: unaligned pointers & atomic ops (excl. Sun Pro) --AC_MSG_CHECKING([for unaligned pointers]) --AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -- [[short x = *(short*)(nezumi + 2)]])], -- [AC_MSG_RESULT([yes]) -- pgm_unaligned_pointers=yes], -- [AC_MSG_RESULT([no]) -- pgm_unaligned_pointers=no]) -+AC_CACHE_CHECK([if unaligned access fails], [ac_cv_lbl_unaligned_fail], -+ [AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -+ [[short x = *(short*)(nezumi + 2)]])], -+ [ac_cv_lbl_unaligned_fail=no], -+ [ac_cv_lbl_unaligned_fail=yes], -+ [ac_cv_lbl_unaligned_fail=yes]) -+ ]) -+if test "$ac_cv_lbl_unaligned_fail" = yes; then -+ pgm_unaligned_pointers=no -+else -+ pgm_unaligned_pointers=yes -+fi - AC_MSG_CHECKING([for intrinsic atomic ops]) - # AC_PREPROC_IFELSE not always portable - AC_COMPILE_IFELSE(
package/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch deleted +0 -55
55 lines not on this page · raw message
package/openpgm/openpgm.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 openpgm-5-2-122.tar.gz +sha256 8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b306499c6d393 openpgm-5-3-128.tar.gz sha256 4a7d4ec71fa60969399fd4caad64d5a3003fee2775445f271a5a36a8ae743a29 openpgm/pgm/LICENSE
package/openpgm/openpgm.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -OPENPGM_VERSION = 5-2-122 +OPENPGM_VERSION = 5-3-128 OPENPGM_SITE = $(call github,steve-o,openpgm,release-$(OPENPGM_VERSION)) OPENPGM_LICENSE = LGPL-2.1+ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE
Signature · 1 line
2.28.0
PATCH v2 2/3 package/zeromq: add support for openpgm 5.3
--- ...re.ac-fix-build-with-openpgm-5-3-128.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/zeromq/0002-configure.ac-fix-build-with-openpgm-5-3-128.patch
package/zeromq/0002-configure.ac-fix-build-with-openpgm-5-3-128.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 883d432c29fe5b81b2b4a6809610c60083571fb4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Wed, 2 Sep 2020 07:54:36 +0200 +Subject: [PATCH] configure.ac: fix build with openpgm-5-3-128 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://github.com/zeromq/libzmq/pull/4027] +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e7193423..49b5d69c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -649,13 +649,18 @@ AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], + + # conditionally require pgm package + if test "x$with_pgm_ext" != "xno"; then +- PKG_CHECK_MODULES([pgm], [openpgm-5.2 >= 5.2], [ ++ PKG_CHECK_MODULES([pgm], [openpgm-5.3 >= 5.3], [ + have_pgm_library="yes" +- PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.2 >= 5.2" ++ PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.3 >= 5.3" + ], [ +- PKG_CHECK_MODULES([pgm], [openpgm-5.1 >= 5.1], [ ++ PKG_CHECK_MODULES([pgm], [openpgm-5.2 >= 5.2], [ + have_pgm_library="yes" +- PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.1 >= 5.1" ++ PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.2 >= 5.2" ++ ], [ ++ PKG_CHECK_MODULES([pgm], [openpgm-5.1 >= 5.1], [ ++ have_pgm_library="yes" ++ PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.1 >= 5.1" ++ ]) + ]) + ]) + fi +-- +2.28.0 +
Signature · 1 line
2.28.0
PATCH v2 3/3 package/zeromq: disable -Werror
In reply to Fabrice FontaineThis will avoid the following build failure with openpgm 5.3:
In file included from /home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/pgm-5.3/pgm/skbuff.h:39,
from /home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/pgm-5.3/pgm/msgv.h:33,
from /home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/pgm-5.3/pgm/pgm.h:44,
from src/ip.cpp:67:
/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/pgm-5.3/pgm/socket.h:207:1: error: ?const char* pgm_family_string(int)? defined but not used [-Werror=unused-function]
207 | pgm_family_string (
| ^~~~~~~~~~~~~~~~~--- package/zeromq/zeromq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/zeromq/zeromq.mk +1 -1
@@ -8,7 +8,7 @@ ZEROMQ_VERSION = 4.3.2 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux -ZEROMQ_CONF_OPTS = --without-documentation +ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER # We're patching acinclude.m4
Signature · 1 line
2.28.0
PATCH v2 1/3 package/openpgm: bump to version 5-3-128
In reply to Fabrice FontaineQuoted 8 lines · On Wed, 2 Sep 2020 08:17:51 +0200 Fabrice Fontaine…
- Drop first patch (not needed since
https://github.com/steve-o/openpgm/commit/e2ff9cf32df5a9037e956a6be1afe75391b1941d)
- Drop second and third patch (already in version)Signed-off-by Fabrice Fontaine <[email protected]>---
Changes v1 -> v2:
- Update zeromq package
I have applied the entire series, but not in the order you proposed: I have applied PATCH 2/3 and 3/3 first, and then PATCH 1/3. Indeed otherwise the series is not bisectable.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com