From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8571F15800F for ; Thu, 2 Feb 2023 07:02:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB0DFE0BC0; Thu, 2 Feb 2023 07:02:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EBA8E0BC0 for ; Thu, 2 Feb 2023 07:02:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BFB73406C2 for ; Thu, 2 Feb 2023 07:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EC1C7F8 for ; Thu, 2 Feb 2023 07:02:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1675320663.a47fe1a0456d92e34a2773b4f4393fa95254d860.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/, net-libs/zeromq/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch net-libs/zeromq/zeromq-4.3.4-r2.ebuild X-VCS-Directories: net-libs/zeromq/ net-libs/zeromq/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a47fe1a0456d92e34a2773b4f4393fa95254d860 X-VCS-Branch: master Date: Thu, 2 Feb 2023 07:02:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67eaf4b4-3759-4985-90fd-7af1b7b6e02c X-Archives-Hash: d773df083b5c132087fb7675b0c4666c commit: a47fe1a0456d92e34a2773b4f4393fa95254d860 Author: Sam James gentoo org> AuthorDate: Thu Feb 2 06:51:03 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Feb 2 06:51:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47fe1a0 net-libs/zeromq: fix build w/ gcc 13 Signed-off-by: Sam James gentoo.org> net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch | 55 +++++++++++++++++++ net-libs/zeromq/zeromq-4.3.4-r2.ebuild | 71 +++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch new file mode 100644 index 000000000000..79deeacc2bd8 --- /dev/null +++ b/net-libs/zeromq/files/zeromq-4.3.4-gcc-13.patch @@ -0,0 +1,55 @@ +https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d + +From 438d5d88392baffa6c2c5e0737d9de19d6686f0d Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 20 Dec 2022 21:45:16 +0000 +Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type + +`gcc-13` added an assert to standard headers to make sure custom +allocators have intended implementation of rebind type instead +of inherited rebind. gcc change: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 + +Without the fix build fails on this week's `gcc-13` as: + + [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o + In file included from /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, + from /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64, + from /<>/gcc-13.0.0/include/c++/13.0.0/memory:69, + from tests/../src/secure_allocator.hpp:42, + from tests/../src/curve_client_tools.hpp:49, + from tests/test_security_curve.cpp:53: + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind, unsigned char, void>': + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t; _Up = unsigned char]' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template template using std::allocator_traits< >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t]' + /<>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits, unsigned char>::rebind' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base >' + /<>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector >' + tests/../src/curve_client_tools.hpp:64:76: required from here + /<>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits::rebind_alloc must be A + 70 | _Tp>::value, + | ^~~~~ + +The change adds trivial `rebind` definition with expected return type +and satisfies conversion requirements. +--- a/src/secure_allocator.hpp ++++ b/src/secure_allocator.hpp +@@ -99,6 +99,17 @@ bool operator!= (const secure_allocator_t &, const secure_allocator_t &) + #else + template struct secure_allocator_t : std::allocator + { ++ secure_allocator_t () ZMQ_DEFAULT; ++ ++ template ++ secure_allocator_t (const secure_allocator_t &) ZMQ_NOEXCEPT ++ { ++ } ++ ++ template struct rebind ++ { ++ typedef secure_allocator_t other; ++ }; + }; + #endif + } + diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild new file mode 100644 index 000000000000..06892942f602 --- /dev/null +++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools + +DESCRIPTION="A brokerless kernel" +HOMEPAGE="https://zeromq.org/" +SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/5" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind" +RESTRICT="!test? ( test )" + +RDEPEND=" + !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) + libbsd? ( dev-libs/libbsd:= ) + sodium? ( dev-libs/libsodium:= ) +" +DEPEND=" + ${RDEPEND} + !elibc_Darwin? ( sys-apps/util-linux ) +" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + ) + pgm? ( virtual/pkgconfig ) +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc-13.patch +) + +src_prepare() { + sed \ + -e '/libzmq_werror=/s:yes:no:g' \ + -i configure.ac || die + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-shared + --without-pgm + $(use_enable drafts) + $(use_enable libbsd) + $(use_enable static-libs static) + $(use_enable unwind libunwind) + $(use_with sodium libsodium) + $(use_with doc docs) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + # Restricting to one job because multiple tests are using the same port. + # Upstream knows the problem and says it doesn't support parallel test + # execution, see ${S}/INSTALL. + emake -j1 check +} + +src_install() { + default + find "${ED}"/usr/lib* -name '*.la' -delete || die +}