From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7D371582EF for ; Wed, 19 Feb 2025 11:05:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B372B3431F0 for ; Wed, 19 Feb 2025 11:05:32 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0A71F110473; Wed, 19 Feb 2025 11:05:26 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 03401110473 for ; Wed, 19 Feb 2025 11:05:25 +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 AC5EC3430FB for ; Wed, 19 Feb 2025 11:05:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1DD92734 for ; Wed, 19 Feb 2025 11:05:23 +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: <1739963055.4afab5a4d1ee006254f6537c8bb090bd6d4b4a0e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/, dev-util/unicorn/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch dev-util/unicorn/unicorn-2.1.2.ebuild X-VCS-Directories: dev-util/unicorn/files/ dev-util/unicorn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4afab5a4d1ee006254f6537c8bb090bd6d4b4a0e X-VCS-Branch: master Date: Wed, 19 Feb 2025 11:05:23 +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: c3f7adbf-22d3-4955-ab5b-b82af4beb7c5 X-Archives-Hash: 36e171716196cd26e16e3e107e1ca38d commit: 4afab5a4d1ee006254f6537c8bb090bd6d4b4a0e Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Feb 19 05:56:49 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 19 11:04:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4afab5a4 dev-util/unicorn: provide version number for python build system Closes: https://bugs.gentoo.org/949873 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/40646 Signed-off-by: Sam James gentoo.org> .../unicorn/files/unicorn-2.1.2-versioningit.patch | 35 ++++++++++++++++++++++ dev-util/unicorn/unicorn-2.1.2.ebuild | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch new file mode 100644 index 000000000000..9be0f31e8478 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.1.2-versioningit.patch @@ -0,0 +1,35 @@ +From 0f45f15e303b4a7b15eb4ca61860452f0a071a3e Mon Sep 17 00:00:00 2001 +From: "@Antelox" +Date: Tue, 18 Feb 2025 09:28:06 +0100 +Subject: [PATCH] Python bindings: (#2112) +Upstream: https://github.com/unicorn-engine/unicorn/pull/2112 + +- Switch from versioningit to setuptools-scm +- Disable building of tests via DUNICORN_BUILD_TESTS var +--- a/bindings/python/pyproject.toml ++++ b/bindings/python/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools", "build", "wheel", "versioningit"] ++requires = ["setuptools>=64", "build", "wheel", "setuptools-scm>=8"] + build-backend = "setuptools.build_meta" + + [project] +@@ -40,4 +40,5 @@ test = [ + [tool.setuptools.packages.find] + include = ["unicorn*"] + +-[tool.versioningit] ++[tool.setuptools_scm] ++root = '../../' +--- a/bindings/python/setup.py ++++ b/bindings/python/setup.py +@@ -102,7 +102,7 @@ def build_libraries(): + + has_msbuild = shutil.which('msbuild') is not None + conf = 'Debug' if int(os.getenv('DEBUG', 0)) else 'Release' +- cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf] ++ cmake_args = ['cmake', '-B', BUILD_DIR, "-DCMAKE_BUILD_TYPE=" + conf, "-DUNICORN_BUILD_TESTS=off"] + if os.getenv("UNICORN_TRACER"): + cmake_args += ["-DUNICORN_TRACER=on"] + if conf == 'Debug': diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index b65c4530a0af..a66c7bbbd255 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -33,7 +33,10 @@ DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig - python? ( ${DISTUTILS_DEPS} )" + python? ( + ${DISTUTILS_DEPS} + >=dev-python/setuptools-scm-8[${PYTHON_USEDEP}] + )" RESTRICT="!test? ( test )" @@ -41,8 +44,11 @@ UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" PATCHES=( "${FILESDIR}/${PN}-2.1.2-return.patch" + "${FILESDIR}/${PN}-2.1.2-versioningit.patch" ) +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + wrap_python() { if use python; then # src_prepare