public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "WANG Xuerui" <xen0n@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/
Date: Wed, 17 Apr 2024 19:47:37 +0000 (UTC)	[thread overview]
Message-ID: <1713383121.a65ce7b0b71668fb49b960d7259b36eba6ab34cc.xen0n@gentoo> (raw)

commit:     a65ce7b0b71668fb49b960d7259b36eba6ab34cc
Author:     Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Apr 15 23:04:59 2024 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Apr 17 19:45:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65ce7b0

sys-libs/libseccomp: rebase experimental-loong patches

The fix backported in d58730757b79ce429d5fbe8f35dede6074d4c243 was
already in the loong tree which makes the patch fail to apply.  Rebase
this and also now rather than having a huge patch that doesn't
correspond to VCS with a bunch of checked-in autotools stuff, use the
github diff and eautoreconf for 9999 and loong.

Fixes: d58730757b79 ("sys-libs/libseccomp: backport fix for arch-syscall-check")
Bug: https://bugs.gentoo.org/926648
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 sys-libs/libseccomp/Manifest                   |  1 +
 sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 2ecd76d3fa12..4140907f66f9 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,2 +1,3 @@
+DIST libseccomp-2.5.5-loongarch-r1.patch 119822 BLAKE2B 4aa75c1ac87b2ca25cf6be38dfd760879c7255ca8e6cf86be3ac6e354f76cdaf3c8e2f59b646254414ffb0f1ffe6b7c50478f4db895a6ce632db8782c9807e91 SHA512 f7cd768d672a25448b2a3ceda27db52e0d62b5d9ab3eeb906226b6ebc19332c89332e0b870aaf82d4ffcfd642c2deb6029a30ae9a6bd702ebad9fdd40622b582
 DIST libseccomp-2.5.5-loongarch64-20231204.patch.xz 41236 BLAKE2B 7831b28c275771bb675b4b5045e657d96c254e69cee7188a19f4812bc83343e0041772c20be1e7392ec88387726b49f34aa670a906b922dba531a0d35e548b1e SHA512 7870e536d834360dfec446493815b675a305f6bec1b79d0caae6fb546d2f694e77ce52e547bbcdb22cda272272bf3d5a427960b4aa76fb987d06ab035298007d
 DIST libseccomp-2.5.5.tar.gz 642445 BLAKE2B d770cee1f3e02fbbcd9f25655b360ab38160ad800e2829a67f2b9da62b095a90be99ac851a67344cf95bd6810a6268da4655dc1d37d996e58239c4999eb41998 SHA512 f630e7a7e53a21b7ccb4d3e7b37616b89aeceba916677c8e3032830411d77a14c2d74dcf594cd193b1acc11f52595072e28316dc44300e54083d5d7b314a38da

diff --git a/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild b/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
index 347a6274d5f7..ecedd688b53f 100644
--- a/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.5.5-r1.ebuild
@@ -16,10 +16,14 @@ HOMEPAGE="https://github.com/seccomp/libseccomp"
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git"
 	PRERELEASE="2.6.0"
+	AUTOTOOLS_AUTO_DEPEND=yes
 	inherit autotools git-r3
 else
+	AUTOTOOLS_AUTO_DEPEND=no
+	inherit autotools
 	SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz
-		experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${PN}-2.5.5-loongarch64-20231204.patch.xz )"
+		experimental-loong? ( https://github.com/matoro/libseccomp/compare/v${PV}..loongarch-r1.patch
+			-> ${P}-loongarch-r1.patch )"
 	KEYWORDS="-* amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 fi
 
@@ -39,6 +43,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	${DEPEND}
 	dev-util/gperf
+	experimental-loong? ( ${AUTOTOOLS_DEPEND} )
 	python? (
 		${DISTUTILS_DEPS}
 		dev-python/cython[${PYTHON_USEDEP}]
@@ -54,11 +59,15 @@ PATCHES=(
 
 src_prepare() {
 	if use experimental-loong; then
-		PATCHES+=( "${WORKDIR}/${PN}-2.5.5-loongarch64-20231204.patch" )
+		PATCHES+=( "${DISTDIR}/${P}-loongarch-r1.patch" )
 	fi
 
 	default
 
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
+	fi
+
 	if use experimental-loong; then
 		# touch generated files to avoid activating maintainer mode
 		# remove when loong-fix-build.patch is no longer necessary
@@ -66,9 +75,8 @@ src_prepare() {
 		find . -name Makefile.in -exec touch {} + || die
 	fi
 
-	if [[ ${PV} == *9999 ]] ; then
-		sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die
-
+	if [[ ${PV} == *9999 ]] || use experimental-loong; then
+		rm -f "include/seccomp.h" || die
 		eautoreconf
 	fi
 }


             reply	other threads:[~2024-04-17 19:47 UTC|newest]

Thread overview: 148+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-17 19:47 WANG Xuerui [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-09 23:55 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/ Sam James
2025-03-09 23:55 Sam James
2025-03-03 20:48 Sam James
2025-03-03 20:44 Sam James
2025-01-24  6:08 Sam James
2025-01-22  1:26 Sam James
2024-11-13 11:10 Arthur Zamarin
2024-11-12 23:48 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-11-11 15:21 Sam James
2024-05-08 19:21 Sam James
2024-05-01  5:28 Joonas Niilola
2024-04-13 18:52 Arthur Zamarin
2024-04-13 18:37 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 16:51 Mike Gilbert
2024-03-06 21:18 Michał Górny
2024-03-02  4:39 Sam James
2024-01-23  5:00 Sam James
2024-01-23  4:17 Sam James
2024-01-18  0:28 Sam James
2024-01-17  8:53 Arthur Zamarin
2024-01-17  6:34 Sam James
2024-01-17  6:34 Sam James
2024-01-17  5:50 Sam James
2024-01-17  5:50 Sam James
2023-12-05 17:52 WANG Xuerui
2023-12-04  6:14 WANG Xuerui
2023-12-03  8:02 Sam James
2023-03-15  9:26 Sam James
2023-03-07 11:39 Sam James
2022-06-24  5:12 WANG Xuerui
2022-06-21  9:41 David Seifert
2022-06-02  7:31 Jakov Smolić
2022-06-02  4:00 Sam James
2022-06-02  4:00 Sam James
2022-06-02  3:57 Jakov Smolić
2022-06-02  3:23 Sam James
2022-06-02  3:05 Sam James
2022-06-02  3:05 Sam James
2022-04-21 20:25 Sam James
2022-04-17 17:06 Sam James
2022-02-23  4:39 Arthur Zamarin
2022-02-19 10:59 Arthur Zamarin
2022-02-19 10:55 Arthur Zamarin
2022-02-19  3:06 Sam James
2022-02-19  3:02 Sam James
2022-02-19  2:40 Sam James
2022-02-19  2:24 Sam James
2021-11-09  4:35 Georgy Yakovlev
2021-11-09  4:35 Georgy Yakovlev
2021-10-07  6:37 Sam James
2021-09-03  6:40 Agostino Sarubbo
2021-09-03  6:34 Agostino Sarubbo
2021-09-02  6:43 Lars Wendler
2021-09-01 18:32 Sam James
2021-09-01 13:38 Agostino Sarubbo
2021-09-01  9:31 Agostino Sarubbo
2021-07-23 22:52 Sam James
2021-05-23 11:48 David Seifert
2021-05-22 21:26 Mike Gilbert
2021-05-16 15:32 Mike Gilbert
2021-05-15 19:14 Sergei Trofimovich
2021-05-14  9:36 Agostino Sarubbo
2021-05-14  9:32 Agostino Sarubbo
2021-05-14  9:31 Agostino Sarubbo
2021-05-14  9:30 Agostino Sarubbo
2021-05-13 16:54 Sam James
2021-05-13 16:30 Sam James
2020-11-29 20:22 Lars Wendler
2020-11-24  7:43 Agostino Sarubbo
2020-11-23  8:01 Sergei Trofimovich
2020-11-23  7:52 Sergei Trofimovich
2020-11-23  4:37 Sam James
2020-11-20 16:54 Lars Wendler
2020-11-20  2:02 Sam James
2020-11-20  2:02 Sam James
2020-11-20  1:34 Thomas Deutschmann
2020-11-19 22:58 Sam James
2020-11-19  9:36 Lars Wendler
2020-10-16  3:45 Joshua Kinard
2020-09-03 20:00 Lars Wendler
2020-07-23 19:53 Lars Wendler
2020-07-23 10:19 Lars Wendler
2020-07-21  9:53 Lars Wendler
2020-07-21  8:32 Lars Wendler
2020-07-21  8:32 Lars Wendler
2020-07-21  8:32 Lars Wendler
2020-07-13 16:16 Sam James
2020-07-09  8:34 Agostino Sarubbo
2020-07-08 12:23 Michał Górny
2020-07-07  6:58 Sergei Trofimovich
2020-07-06 11:27 Mart Raudsepp
2020-07-06  7:22 Sergei Trofimovich
2020-07-06  7:02 Sergei Trofimovich
2020-05-04 17:36 Thomas Deutschmann
2020-03-07 15:51 Lars Wendler
2020-03-07 15:51 Lars Wendler
2020-02-02 20:37 Anthony G. Basile
2019-12-24 14:21 Mikle Kolyada
2019-12-24  8:08 Agostino Sarubbo
2019-12-23 10:00 Sergei Trofimovich
2019-12-20 12:30 Agostino Sarubbo
2019-12-20 12:13 Agostino Sarubbo
2019-12-20 11:33 Agostino Sarubbo
2019-12-19 15:44 Agostino Sarubbo
2019-11-19  8:56 Jeroen Roovers
2019-11-11 14:26 Lars Wendler
2019-04-18 15:40 Mike Gilbert
2019-04-15  8:52 Mikle Kolyada
2019-04-08  4:32 Aaron Bauman
2019-04-02  9:45 Mikle Kolyada
2019-03-29  4:41 Matt Turner
2019-03-29  4:41 Matt Turner
2019-03-20 17:05 Markus Meier
2019-03-18  8:17 Lars Wendler
2019-03-18  7:48 Lars Wendler
2019-03-15 11:46 Lars Wendler
2019-03-15 11:46 Lars Wendler
2018-06-07 21:02 Mike Frysinger
2018-06-07 21:02 Mike Frysinger
2018-05-29 11:43 Michael Haubenwallner
2018-05-15  1:46 Thomas Deutschmann
2018-05-14 21:25 Sergei Trofimovich
2018-05-14 12:37 Mikle Kolyada
2018-05-14  4:21 Mart Raudsepp
2018-02-21 16:01 Michael Haubenwallner
2018-01-11 22:37 Mike Frysinger
2018-01-11 22:32 Mike Frysinger
2017-07-07  6:18 Markus Meier
2017-03-09  6:46 Mike Frysinger
2017-03-09  6:46 Mike Frysinger
2016-05-25 15:31 Mike Frysinger
2016-05-09 19:24 Richard Farina
2016-04-26 13:40 Doug Goldstein
2016-03-23  5:25 Mike Frysinger
2016-03-23  5:25 Mike Frysinger
2016-03-06 12:58 Agostino Sarubbo
2016-02-29 18:54 Mike Frysinger
2015-08-19  4:25 Mike Frysinger
2015-08-17 18:58 Mike Frysinger
2015-08-17 18:58 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1713383121.a65ce7b0b71668fb49b960d7259b36eba6ab34cc.xen0n@gentoo \
    --to=xen0n@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox