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 E560A158010 for ; Mon, 9 Jan 2023 05:53:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1095DE07DB; Mon, 9 Jan 2023 05:53:20 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0879E07D8 for ; Mon, 9 Jan 2023 05:53:19 +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 B4B7D340E81 for ; Mon, 9 Jan 2023 05:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F1EA771 for ; Mon, 9 Jan 2023 05:53:17 +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: <1673243566.5f88996c5e26575277f3167ea7bc99368d1fac35.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/libeatmydata/, sys-fs/libeatmydata/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/libeatmydata/Manifest sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch sys-fs/libeatmydata/libeatmydata-131.ebuild X-VCS-Directories: sys-fs/libeatmydata/ sys-fs/libeatmydata/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f88996c5e26575277f3167ea7bc99368d1fac35 X-VCS-Branch: master Date: Mon, 9 Jan 2023 05:53:17 +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: 7957311c-56ec-4352-83a9-92c5caa073de X-Archives-Hash: 70c6897ad4da13f3039e8b9efa4336da commit: 5f88996c5e26575277f3167ea7bc99368d1fac35 Author: Sam James gentoo org> AuthorDate: Mon Jan 9 05:47:24 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 9 05:52:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f88996c sys-fs/libeatmydata: add 131 Signed-off-by: Sam James gentoo.org> sys-fs/libeatmydata/Manifest | 1 + .../files/libeatmydata-131-gnu_source.patch | 52 ++++++++++++++++++++++ sys-fs/libeatmydata/libeatmydata-131.ebuild | 39 ++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest index 4298bb47c862..3675698a430d 100644 --- a/sys-fs/libeatmydata/Manifest +++ b/sys-fs/libeatmydata/Manifest @@ -1 +1,2 @@ DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18 +DIST libeatmydata-131.tar.gz 368469 BLAKE2B 1b59f80ba72caeafa40272c5996e0fb03774c69c35d7a2194d312e53c48212caca84abed56ec63a9fba2b4142efbee4aa371c3869a76f8c5674936ffe0daea5d SHA512 064417dc085cb82e4baf1d160fcde2c6e0d9fed60e5c595799630b030053c373d888853055894c127c5b384be9204e8bbb251877651811b5fc5cdca8ffd9cf42 diff --git a/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch b/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch new file mode 100644 index 000000000000..b60cdea868c4 --- /dev/null +++ b/sys-fs/libeatmydata/files/libeatmydata-131-gnu_source.patch @@ -0,0 +1,52 @@ +https://github.com/stewartsmith/libeatmydata/pull/30 + +From 9b37e3994f94687085e234d153c9ae3abdd038d3 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 9 Jan 2023 05:50:13 +0000 +Subject: [PATCH] Avoid redefining _GNU_SOURCE + +It's harmless, but with 3dea342f64a73a271d24779474d1b304b8f5618c, we get: +``` +x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131 -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Werror=implicit-function-declaration -Werror=implicit-int -c -o libeatmydata/test/tst-cancel4.o /var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c +/var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c:28: warning: "_GNU_SOURCE" redefined + 28 | #define _GNU_SOURCE + | +In file included from /var/tmp/portage/sys-fs/libeatmydata-131/work/libeatmydata-131/libeatmydata/test/tst-cancel4.c:26: +./config.h:115: note: this is the location of the previous definition + 115 | # define _GNU_SOURCE 1 + | +``` + +This is because we already have `AC_USE_SYSTEM_EXTENSIONS` in configure.ac +which sets GNU_SOURCE in config.h for us. + +We also explicitly add a config.h include to tst-invalidvd.c instead +of relying on it via portability.h. +--- a/libeatmydata/test/tst-cancel4.c ++++ b/libeatmydata/test/tst-cancel4.c +@@ -25,7 +25,6 @@ + + #include "config.h" + +-#define _GNU_SOURCE + #include + #include + #include +--- a/libeatmydata/test/tst-invalidfd.c ++++ b/libeatmydata/test/tst-invalidfd.c +@@ -13,6 +13,7 @@ + * with this program. If not, see . + * END LICENSE */ + ++#include "config.h" + #include "libeatmydata/portability.h" + + #include +@@ -21,7 +22,6 @@ + #include + + #ifdef HAVE_SYNC_FILE_RANGE +-#define _GNU_SOURCE + #include + #endif + diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild new file mode 100644 index 000000000000..92d05a4733a5 --- /dev/null +++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Multilib because "handy to inject into wine" +inherit multilib-minimal + +DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP" +HOMEPAGE="https://www.flamingspork.com/projects/libeatmydata/" +SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( dev-util/strace )" + +PATCHES=( + "${FILESDIR}"/${PN}-131-gnu_source.patch +) + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf +} + +multilib_src_test() { + # Sandbox fools LD_PRELOAD and libeatmydata does not get control + # feature of sandbox + SANDBOX_ON=0 LD_PRELOAD= emake -k check +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -type f -delete || die + + dodoc AUTHORS README.md +}