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 7D6F5158086 for ; Fri, 31 Dec 2021 02:50:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8455E077F; Fri, 31 Dec 2021 02:50:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 A3F25E077F for ; Fri, 31 Dec 2021 02:50:12 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E274342D3E for ; Fri, 31 Dec 2021 02:50:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D320266 for ; Fri, 31 Dec 2021 02:50:09 +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: <1640919001.c1e70e74d97b9cccca55f9f8321f81916d0d1870.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/, sys-fs/btrfs-progs/files/ 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: c1e70e74d97b9cccca55f9f8321f81916d0d1870 X-VCS-Branch: master Date: Fri, 31 Dec 2021 02:50:09 +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: e29ac3f0-96c2-4df3-a171-2cea060bdf0b X-Archives-Hash: fbe77fbb33ca94e703a98f455730f15f commit: c1e70e74d97b9cccca55f9f8321f81916d0d1870 Author: Sam James gentoo org> AuthorDate: Fri Dec 31 02:49:26 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 31 02:50:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e70e74 sys-fs/btrfs-progs: drop unnecessary musl patch Adjusted linux-headers patch instead. Bug: https://bugs.gentoo.org/830277 Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild | 4 --- .../files/5.15-musl-const.h-include.patch | 34 ---------------------- 2 files changed, 38 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 01b66383b662..64cc91680915 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -79,10 +79,6 @@ 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 deleted file mode 100644 index a9156ade4b79..000000000000 --- a/sys-fs/btrfs-progs/files/5.15-musl-const.h-include.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -