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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 320FA158086 for ; Wed, 29 Dec 2021 06:27:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 499742BC003; Wed, 29 Dec 2021 06:27:27 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 137902BC003 for ; Wed, 29 Dec 2021 06:27:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94541342EB9 for ; Wed, 29 Dec 2021 06:27:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E1BE261 for ; Wed, 29 Dec 2021 06:27:22 +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: <1640759230.aa59b7b0761874e3478702334b14a7df8c08b912.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcmciautils/files/, sys-apps/pcmciautils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild X-VCS-Directories: sys-apps/pcmciautils/ sys-apps/pcmciautils/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: aa59b7b0761874e3478702334b14a7df8c08b912 X-VCS-Branch: master Date: Wed, 29 Dec 2021 06:27:22 +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: 80cf84c1-5ce4-4784-bf58-bef11bef7e2c X-Archives-Hash: 6c5f0ca965fa4372342aa767ecea7209 commit: aa59b7b0761874e3478702334b14a7df8c08b912 Author: Sam James gentoo org> AuthorDate: Wed Dec 29 06:17:40 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 29 06:27:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa59b7b0 sys-apps/pcmciautils: fix musl build Closes: https://bugs.gentoo.org/716120 Signed-off-by: Sam James gentoo.org> .../pcmciautils-018_p8-musl-unsigned-type.patch | 24 ++++++++++++++++++++++ sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild | 13 ++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch new file mode 100644 index 000000000000..6039b8147096 --- /dev/null +++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch @@ -0,0 +1,24 @@ +https://git.alpinelinux.org/aports/plain/main/pcmciautils/unsigned.patch +https://bugs.gentoo.org/716120 +--- a/src/read-cis.c ++++ b/src/read-cis.c +@@ -51,7 +51,7 @@ + /* Get indirect link from the MFC tuple */ + read_cis(tuple->Flags.link_space, + tuple->LinkOffset, 5, link); +- ofs = *(u_int *)(link+1); ++ ofs = *(unsigned int *)(link+1); + tuple->Flags.space = (link[0] == CISTPL_MFC_ATTR); + /* Move to the next indirect link */ + tuple->LinkOffset += 5; +--- a/src/yacc_config.y ++++ b/src/yacc_config.y +@@ -40,7 +40,7 @@ + + %union { + char *str; +- u_long num; ++ unsigned long num; + struct adjust_list_t *adjust; + } + diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild index d27c8288425f..e42d81c1d8d8 100644 --- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild +++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild @@ -24,6 +24,13 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-${MY_PV} +PATCHES=( + "${WORKDIR}"/debian/patches/no-modprobe-rules.patch + "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch + "${FILESDIR}"/${P}-flex-2.6.3-fix.patch + "${FILESDIR}"/${PN}-018_p8-musl-unsigned-type.patch +) + pkg_setup() { CONFIG_CHECK="~PCMCIA" linux-info_pkg_setup @@ -49,12 +56,6 @@ pkg_setup() { use debug && append-cppflags -DDEBUG } -PATCHES=( - "${WORKDIR}"/debian/patches/no-modprobe-rules.patch - "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch - "${FILESDIR}"/${P}-flex-2.6.3-fix.patch -) - src_prepare() { default sed -i \