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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18D0F138334 for ; Sat, 10 Nov 2018 21:45:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05668E0D82; Sat, 10 Nov 2018 21:45:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CBCFCE0D82 for ; Sat, 10 Nov 2018 21:45:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E147335CF2 for ; Sat, 10 Nov 2018 21:45:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 623EE3DA for ; Sat, 10 Nov 2018 21:45:13 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1541886304.e2c6fa0a4d2c2e75aa2e76c9f6d3d68314f4d989.slyfox@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-4.19.ebuild sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch X-VCS-Directories: sys-fs/btrfs-progs/ sys-fs/btrfs-progs/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: e2c6fa0a4d2c2e75aa2e76c9f6d3d68314f4d989 X-VCS-Branch: master Date: Sat, 10 Nov 2018 21:45:13 +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-Archives-Salt: 51916b52-4c69-4865-8cd6-25f4dc44eebf X-Archives-Hash: 7447207225517521d8887aa811000fe4 commit: e2c6fa0a4d2c2e75aa2e76c9f6d3d68314f4d989 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Nov 10 21:44:53 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Nov 10 21:45:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c6fa0a sys-fs/btrfs-progs: fix build failure on big-endian platforms Reported-by: ernsteiswuerfel Bug: https://bugs.gentoo.org/670741 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild | 4 ++++ .../files/btrfs-progs-4.19-be-bswap.patch | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild index 04d53839609..c0e82c0a114 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild @@ -72,6 +72,10 @@ fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}"/${P}-be-bswap.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch new file mode 100644 index 00000000000..b91b3204085 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch @@ -0,0 +1,24 @@ +Fix build failure on big-endian platforms. + +Reported-by: ernsteiswuerfel +Bug: https://bugs.gentoo.org/670741 +--- a/kernel-lib/bitops.h ++++ b/kernel-lib/bitops.h +@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y) + #if BITS_PER_LONG == 64 +- return (unsigned long) bswap64((u64) y); ++ return (unsigned long) bswap_64((u64) y); + #elif BITS_PER_LONG == 32 +- return (unsigned long) bswap32((u32) y); ++ return (unsigned long) bswap_32((u32) y); + #else +@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, + +-unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, ++static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, + unsigned long offset) +@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, + +-unsigned long find_next_bit_le(const void *addr, unsigned long size, ++static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, + unsigned long offset)