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 72FE9158086 for ; Thu, 30 Dec 2021 09:41:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E11F2BC0A6; Thu, 30 Dec 2021 09:41:11 +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 0DA712BC0A6 for ; Thu, 30 Dec 2021 09:41:11 +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 3CEDD343070 for ; Thu, 30 Dec 2021 09:41:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8396A26D for ; Thu, 30 Dec 2021 09:41:05 +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: <1640857251.f3b533bb1984665fe0864dfba62eb1d933caf3c4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch X-VCS-Directories: sys-fs/btrfs-progs/ sys-fs/btrfs-progs/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f3b533bb1984665fe0864dfba62eb1d933caf3c4 X-VCS-Branch: master Date: Thu, 30 Dec 2021 09:41:05 +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: 2084a881-e21f-468b-a8b3-7d9e14b8a67f X-Archives-Hash: 50a988a21d3302c70ec8036d0fcefe40 commit: f3b533bb1984665fe0864dfba62eb1d933caf3c4 Author: Sam James gentoo org> AuthorDate: Thu Dec 30 09:40:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 30 09:40:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b533bb sys-fs/btrfs-progs: fix build on musl Closes: https://bugs.gentoo.org/830277 Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild | 8 +++-- .../files/5.15-musl-const.h-include.patch | 34 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild index 1669da04cd9e..01b66383b662 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -29,7 +29,7 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +RESTRICT="test" # tries to mount repaired filesystems RDEPEND=" dev-libs/lzo:2= @@ -74,11 +74,15 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/5.15-musl-const.h-include.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch new file mode 100644 index 000000000000..a9156ade4b79 --- /dev/null +++ b/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch @@ -0,0 +1,34 @@ +https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch?id=fd8989db25c674ca65389a2d41bf5b447e8794be + +From: Bruce Ashfield +Date: Fri, 18 Jun 2021 11:10:36 -0400 +Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ + headers + +btrfs-tools compile fails with mips, musl and 5.12+ headers. + +The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we +add an explicit include of const.h to pickup the macro: + + | make: *** [Makefile:595: mkfs.btrfs] Error 1 + | make: *** Waiting for unfinished jobs.... + | libbtrfs.a(volumes.o): in function `dev_extent_search_start': + | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' + | collect2: error: ld returned 1 exit status + +This is safe for older kernel's as well, since the header still +exists, and is valid to include. + +Upstream-status: OE Specific [mips64 + musl + libc-headers] + +Signed-off-by: Bruce Ashfield +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include +