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 6287A15806E for ; Wed, 31 May 2023 13:31:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97525E0899; Wed, 31 May 2023 13:31:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 68130E0899 for ; Wed, 31 May 2023 13:31:47 +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 78227340FCC for ; Wed, 31 May 2023 13:31:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A41C3990 for ; Wed, 31 May 2023 13:31:44 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1685539876.1a7fbac540cd29d4a88d0067750dd60c606d614b.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libax25/, dev-libs/libax25/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch dev-libs/libax25/libax25-0.0.12_rc5.ebuild X-VCS-Directories: dev-libs/libax25/ dev-libs/libax25/files/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: 1a7fbac540cd29d4a88d0067750dd60c606d614b X-VCS-Branch: master Date: Wed, 31 May 2023 13:31:44 +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: 4894a29a-c74c-4354-8778-4300fef64b0b X-Archives-Hash: 5d9a04c5805bea2f6191b1d65bf705c2 commit: 1a7fbac540cd29d4a88d0067750dd60c606d614b Author: Thomas Beierlein gentoo org> AuthorDate: Wed May 31 13:29:20 2023 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Wed May 31 13:31:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7fbac5 dev-libs/libax25: Install missing headers unconditionally for MUSL based systems Closes: https://bugs.gentoo.org/907465 Signed-off-by: Thomas Beierlein gentoo.org> .../libax25/files/libax25-0.0.12_rc5-musl.patch | 23 ++++++++++++++++++++++ dev-libs/libax25/libax25-0.0.12_rc5.ebuild | 10 +++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch b/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch new file mode 100644 index 000000000000..2507d25ea83b --- /dev/null +++ b/dev-libs/libax25/files/libax25-0.0.12_rc5-musl.patch @@ -0,0 +1,23 @@ +As MUSL libc does not provide netax25/ax25.h, netrom/netrom.h and +netrose/rose.h instatll substitute files uncondiditionally. See bug #907465 + +diff --git a/Makefile.am b/Makefile.am +index 0ff5f37..517e084 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,15 +7,9 @@ libax25ioincludedir = $(includedir) + AM_CPPFLAGS = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \ + -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" + +-if !AX25_H + USE_LIBAX25_AX25_H = netax25/ax25.h +-endif +-if !NETROM_H + USE_LIBAX25_NETROM_H = netrom/netrom.h +-endif +-if !ROSE_H + USE_LIBAX25_ROSE_H = netrose/rose.h +-endif + + nobase_libax25include_HEADERS = \ + netax25/axlib.h \ diff --git a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild index 7b1d1c34fbd9..3eea73794bff 100644 --- a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild +++ b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MY_P=${PN}-$(ver_rs 3 '-') +inherit autotools + DESCRIPTION="AX.25 library for hamradio applications" HOMEPAGE="http://www.linux-ax25.org/" SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.xz" @@ -16,6 +18,12 @@ IUSE="static-libs" S=${WORKDIR}/${MY_P} +src_prepare() { + use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch" + eapply_user + eautoreconf +} + src_configure() { econf $(use_enable static-libs static) }