[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/, dev-util/unicorn/files/
commit: 28561f34fc266ed077cfa514ad8206c8faafa032 Author: Z. Liu gmail com> AuthorDate: Thu May 15 14:42:37 2025 + Commit: Sam James gentoo org> CommitDate: Thu May 22 15:58:48 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28561f34 dev-util/unicorn: don't call strings directly Closes: https://bugs.gentoo.org/940715 Signed-off-by: Z. Liu gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42100 Closes: https://github.com/gentoo/gentoo/pull/42100 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/files/unicorn-2.1.3-strings.patch | 40 ++ dev-util/unicorn/unicorn-2.1.3.ebuild | 8 - 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dev-util/unicorn/files/unicorn-2.1.3-strings.patch b/dev-util/unicorn/files/unicorn-2.1.3-strings.patch new file mode 100644 index ..00cf498d15e7 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.1.3-strings.patch @@ -0,0 +1,40 @@ +https://github.com/unicorn-engine/unicorn/pull/2186 + +From e57d319971005235cc6946f0ba9e832a339aecb1 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" +Date: Thu, 15 May 2025 21:50:55 +0800 +Subject: [PATCH] qemu/configure: make strings command can be redefined by + ${STRINGS} + +Signed-off-by: Z. Liu +--- + qemu/configure | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/qemu/configure b/qemu/configure +index e8eb427c..af3781c3 100755 +--- a/qemu/configure b/qemu/configure +@@ -339,6 +339,7 @@ ld="${LD-${cross_prefix}ld}" + ranlib="${RANLIB-${cross_prefix}ranlib}" + nm="${NM-${cross_prefix}nm}" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" + query_pkg_config() { + "${pkg_config_exe}" ${QEMU_PKG_CONFIG_FLAGS} "$@" +@@ -1233,9 +1234,9 @@ int main(int argc, char *argv[]) { + EOF + + if compile_object ; then +-if strings -a $TMPO | grep -q BiGeNdIaN ; then ++if ${strings} -a $TMPO | grep -q BiGeNdIaN ; then + bigendian="yes" +-elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then ++elif ${strings} -a $TMPO | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed +-- +2.45.2 + diff --git a/dev-util/unicorn/unicorn-2.1.3.ebuild b/dev-util/unicorn/unicorn-2.1.3.ebuild index 0b60c04c3d9b..dd0f2cf96f16 100644 --- a/dev-util/unicorn/unicorn-2.1.3.ebuild +++ b/dev-util/unicorn/unicorn-2.1.3.ebuild @@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake distutils-r1 +inherit cmake distutils-r1 toolchain-funcs DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" HOMEPAGE="https://www.unicorn-engine.org"; @@ -44,6 +44,10 @@ UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} +PATCHES=( + "${FILESDIR}"/${PN}-2.1.3-strings.patch +) + wrap_python() { if use python; then # src_prepare @@ -69,6 +73,8 @@ src_prepare() { } src_configure(){ + tc-export STRINGS + local mycmakeargs=( -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" -DUNICORN_LOGGING=$(usex logging)
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: af3432d8d0ae258f414b760e2b8442fa527af08d Author: Sam James gentoo org> AuthorDate: Tue Apr 22 04:42:31 2025 + Commit: Sam James gentoo org> CommitDate: Tue Apr 22 04:42:31 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af3432d8 dev-util/unicorn: Stabilize 2.1.3 amd64, #954173 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.3.ebuild b/dev-util/unicorn/unicorn-2.1.3.ebuild index ebf3b58125c5..0b60c04c3d9b 100644 --- a/dev-util/unicorn/unicorn-2.1.3.ebuild +++ b/dev-util/unicorn/unicorn-2.1.3.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 44be9d2ff3e0028b09d7f485934ff0c746ce1d04 Author: Sam James gentoo org> AuthorDate: Tue Apr 22 04:42:29 2025 + Commit: Sam James gentoo org> CommitDate: Tue Apr 22 04:42:29 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44be9d2f dev-util/unicorn: Stabilize 2.1.3 x86, #954173 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.3.ebuild b/dev-util/unicorn/unicorn-2.1.3.ebuild index 0aa13795a01e..d16aa9294c8a 100644 --- a/dev-util/unicorn/unicorn-2.1.3.ebuild +++ b/dev-util/unicorn/unicorn-2.1.3.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 2e90fcd65b7936486440efc76a14a8d06c9a2764 Author: Sam James gentoo org> AuthorDate: Tue Apr 22 04:42:30 2025 + Commit: Sam James gentoo org> CommitDate: Tue Apr 22 04:42:30 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e90fcd6 dev-util/unicorn: Stabilize 2.1.3 arm64, #954173 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.3.ebuild b/dev-util/unicorn/unicorn-2.1.3.ebuild index d16aa9294c8a..ebf3b58125c5 100644 --- a/dev-util/unicorn/unicorn-2.1.3.ebuild +++ b/dev-util/unicorn/unicorn-2.1.3.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 916ded910f76fa5411ce4daca8fb8d0b71f19ae0 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 28 16:58:26 2025 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 28 16:58:26 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916ded91 dev-util/unicorn: Stabilize 2.1.2 arm64, #951948 Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-2.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index 106b5d45b6e9..92a55a9b532a 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 466b9b6165b2e75ab5b6bae1d9858da72a48198c Author: Sam James gentoo org> AuthorDate: Sat Mar 22 19:44:09 2025 + Commit: Sam James gentoo org> CommitDate: Sat Mar 22 19:44:09 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466b9b61 dev-util/unicorn: Stabilize 2.1.2 x86, #951745 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index 6e7ddbc99d65..106b5d45b6e9 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 97e15a285fc0c067451ff973e133983ecfbb3ec6 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Mar 22 09:40:43 2025 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 22 09:40:43 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e15a28 dev-util/unicorn: Stabilize 2.1.2 amd64, #951745 Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-2.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index a66c7bbbd255..6e7ddbc99d65 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: a0e4b78ef862908e00842d4a717bd095c201cfd4 Author: Sam James gentoo org> AuthorDate: Wed Mar 19 02:42:27 2025 + Commit: Sam James gentoo org> CommitDate: Wed Mar 19 02:42:27 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e4b78e dev-util/unicorn: Stabilize 2.1.1 amd64, #951576 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.1.1.ebuild b/dev-util/unicorn/unicorn-2.1.1.ebuild index 4f4f82273052..2f445dd214d9 100644 --- a/dev-util/unicorn/unicorn-2.1.1.ebuild +++ b/dev-util/unicorn/unicorn-2.1.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: ef4c8460f8426beee3abee22184f98ef1aa9da54 Author: Sam James gentoo org> AuthorDate: Wed Mar 19 02:42:25 2025 + Commit: Sam James gentoo org> CommitDate: Wed Mar 19 02:42:25 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4c8460 dev-util/unicorn: Stabilize 2.1.1 x86, #951576 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.1.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.1.1.ebuild b/dev-util/unicorn/unicorn-2.1.1.ebuild index bec4af229dfd..4f4f82273052 100644 --- a/dev-util/unicorn/unicorn-2.1.1.ebuild +++ b/dev-util/unicorn/unicorn-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 084ecb4a4dd95da8f55cbc0e8bb49a182305896c Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Mar 8 12:34:35 2025 + Commit: Sam James gentoo org> CommitDate: Mon Mar 10 02:06:31 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084ecb4a dev-util/unicorn: add 2.1.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/unicorn-2.1.3.ebuild | 109 ++ 2 files changed, 110 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index a9ee7657805e..46c79e82c043 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,3 +1,4 @@ DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f DIST unicorn-2.1.1.gh.tar.gz 4176172 BLAKE2B 3dd434121418b9a4eb69683cfca6ec0cd019b632492fbfff421eaf26f4907a2f30bf78699b3afe28df624037e3973a5110a6ea21bd233e66a04a689d3e3e5d1c SHA512 d6184b87a0fb729397ec2ac2cb8bfd9d10c9d4276e49efa681c66c7c54d1a325305a920332a708e68989cc299d0d1a543a1ceeaf552a9b44ec93084f7bf85ef2 DIST unicorn-2.1.2.gh.tar.gz 4196820 BLAKE2B 3e97c0f0b6dccd157222d473ef51f28fbcaf72eda056713fe1463a3f741f1abe6fbf73d770f391c3730c02e94ede2de4f25c0bf460c80dcc560a79258a7338b2 SHA512 f05e16f02fbf527875f7246811307b8b224cecd4d305dd59490a2a51444672c7ec769153545c857b5425111c19b8c0c33abbb51fcc8d49c071d31cf32630 +DIST unicorn-2.1.3.gh.tar.gz 4197694 BLAKE2B 97f3954a33e7eed4264c4fdd33f011da39a3f4cca96c5e3bcdc88d10bb3a2392ced00a8c79470100c9f0b3f48c118a4c99e6a632dedccf5a20e3a4f7fd4e0fa7 SHA512 49aa53cd981e88857cf579010e3e86a6808fbfc9723fbf73c3d5bcebf945c5d78ffcdf426a4bbcd06b13337a3a0ce76bce8815497e3521023ae432a053d3e4bb diff --git a/dev-util/unicorn/unicorn-2.1.3.ebuild b/dev-util/unicorn/unicorn-2.1.3.ebuild new file mode 100644 index ..0aa13795a01e --- /dev/null +++ b/dev-util/unicorn/unicorn-2.1.3.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="https://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD-2 GPL-2 LGPL-2.1" +SLOT="0/2" +IUSE="logging python static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig + python? ( + ${DISTUTILS_DEPS} + >=dev-python/setuptools-scm-8[${PYTHON_USEDEP}] + )" + +RESTRICT="!test? ( test )" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" + +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + +wrap_python() { + if use python; then + # src_prepare + # Do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null || die + fi +} + +src_prepare() { + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + + cmake_src_prepare + wrap_python ${FUNCNAME} + + if use elibc_musl ; then + QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) + fi +} + +src_configure(){ + local mycmakeargs=( + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + -DUNICORN_LOGGING=$(usex logging) + -DUNICORN_LEGACY_STATIC_ARCHIVE=$(usex static-libs) + -DZIG_BUILD=OFF + ) + + cmake_src_configure + + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + + wrap_python ${FUNCNAME} +} + +src_test() { + cmake_src_install + + wrap_python ${FUNCNAME} +} + +python_test() { +# export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + for f in tests/test_*.py; do + if test -x ${f}; then + LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" ${EPYHTON} ${f} || die + fi + done +} + +src_install() { + cmake_src_install + + wrap_python ${FUNCNAME} +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 3fb885ecbaeeab632b115a973fbf799a32aea552 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Mar 8 12:35:15 2025 + Commit: Sam James gentoo org> CommitDate: Mon Mar 10 02:06:31 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb885ec dev-util/unicorn: sync live Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/40959 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-.ebuild | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 6afc0cd70a64..0aa13795a01e 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -33,12 +33,17 @@ 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 )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" +export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} + wrap_python() { if use python; then # src_prepare
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/, dev-util/unicorn/files/
commit: 4afab5a4d1ee006254f6537c8bb090bd6d4b4a0e Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Feb 19 05:56:49 2025 + Commit: Sam James gentoo org> CommitDate: Wed Feb 19 11:04:15 2025 + 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 ..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
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/
commit: 9d9ee0c5ae72128eb719f28048ab88cb85344965 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Feb 19 05:52:39 2025 + Commit: Sam James gentoo org> CommitDate: Wed Feb 19 11:04:15 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9ee0c5 dev-util/unicorn: fix build failure on ppc Closes: https://bugs.gentoo.org/949905 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/files/unicorn-2.1.2-return.patch | 57 +++ dev-util/unicorn/unicorn-2.1.2.ebuild | 4 ++ 2 files changed, 61 insertions(+) diff --git a/dev-util/unicorn/files/unicorn-2.1.2-return.patch b/dev-util/unicorn/files/unicorn-2.1.2-return.patch new file mode 100644 index ..79e5f2f57197 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.1.2-return.patch @@ -0,0 +1,57 @@ +From d03c0922e6c86741001ff8f40140be37c99eb83a Mon Sep 17 00:00:00 2001 +From: Disconnect3d +Date: Fri, 14 Feb 2025 18:04:30 +0100 +Subject: [PATCH] Fix #2103: qemu/target/ppc/mem_helper.c remove redundant + return statements (#2104) +Upstream: https://github.com/unicorn-engine/unicorn/pull/2104 + +--- a/qemu/target/ppc/mem_helper.c b/qemu/target/ppc/mem_helper.c +@@ -387,7 +387,6 @@ uint64_t helper_lq_le_parallel(CPUPPCState *env, target_ulong addr, + return int128_getlo(ret); + #else + g_assert_not_reached(); +-return 0; + #endif + } + +@@ -404,7 +403,6 @@ uint64_t helper_lq_be_parallel(CPUPPCState *env, target_ulong addr, + return int128_getlo(ret); + #else + g_assert_not_reached(); +-return 0; + #endif + } + +@@ -420,7 +418,6 @@ void helper_stq_le_parallel(CPUPPCState *env, target_ulong addr, + helper_atomic_sto_le_mmu(env, addr, val, opidx, GETPC()); + #else + g_assert_not_reached(); +-return 0; + #endif + } + +@@ -436,7 +433,6 @@ void helper_stq_be_parallel(CPUPPCState *env, target_ulong addr, + helper_atomic_sto_be_mmu(env, addr, val, opidx, GETPC()); + #else + g_assert_not_reached(); +-return 0; + #endif + } + #endif +@@ -465,7 +461,6 @@ uint32_t helper_stqcx_le_parallel(CPUPPCState *env, target_ulong addr, + return env->so + success * CRF_EQ_BIT; + #else + g_assert_not_reached(); +-return 0; + #endif + } + +@@ -492,7 +487,6 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr, + return env->so + success * CRF_EQ_BIT; + #else + g_assert_not_reached(); +-return 0; + #endif + } + diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index 6afc0cd70a64..b65c4530a0af 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -39,6 +39,10 @@ RESTRICT="!test? ( test )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" +PATCHES=( + "${FILESDIR}/${PN}-2.1.2-return.patch" +) + wrap_python() { if use python; then # src_prepare
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 09bad021f5e1eefc71c6b421d56fa60340111057 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Feb 16 12:38:17 2025 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 12:46:42 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bad021 dev-util/unicorn: sync live Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/40595 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-.ebuild | 28 ++-- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index c5f1b2deb1ce..6afc0cd70a64 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,6 +8,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) + inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" @@ -25,7 +26,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="BSD-2 GPL-2 LGPL-2.1" SLOT="0/2" -IUSE="logging python static-libs" +IUSE="logging python static-libs test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} @@ -34,6 +35,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" +RESTRICT="!test? ( test )" + UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" wrap_python() { @@ -54,6 +57,7 @@ src_prepare() { cmake_src_prepare wrap_python ${FUNCNAME} + if use elibc_musl ; then QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) fi @@ -63,6 +67,7 @@ src_configure(){ local mycmakeargs=( -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" -DUNICORN_LOGGING=$(usex logging) + -DUNICORN_LEGACY_STATIC_ARCHIVE=$(usex static-libs) -DZIG_BUILD=OFF ) @@ -77,12 +82,23 @@ src_compile() { wrap_python ${FUNCNAME} } -src_install() { +src_test() { cmake_src_install - if ! use static-libs; then - find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die - fi + wrap_python ${FUNCNAME} +} + +python_test() { +# export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + for f in tests/test_*.py; do + if test -x ${f}; then + LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" ${EPYHTON} ${f} || die + fi + done +} + +src_install() { + cmake_src_install wrap_python ${FUNCNAME} }
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: c1612da5fddaa6ec85090c9fb6613d7e2d8c660f Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Feb 16 12:37:52 2025 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 12:46:42 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1612da5 dev-util/unicorn: add 2.1.2 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/unicorn-2.1.2.ebuild | 104 ++ 2 files changed, 105 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index fe438d78e2c7..a9ee7657805e 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1,3 @@ DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f DIST unicorn-2.1.1.gh.tar.gz 4176172 BLAKE2B 3dd434121418b9a4eb69683cfca6ec0cd019b632492fbfff421eaf26f4907a2f30bf78699b3afe28df624037e3973a5110a6ea21bd233e66a04a689d3e3e5d1c SHA512 d6184b87a0fb729397ec2ac2cb8bfd9d10c9d4276e49efa681c66c7c54d1a325305a920332a708e68989cc299d0d1a543a1ceeaf552a9b44ec93084f7bf85ef2 +DIST unicorn-2.1.2.gh.tar.gz 4196820 BLAKE2B 3e97c0f0b6dccd157222d473ef51f28fbcaf72eda056713fe1463a3f741f1abe6fbf73d770f391c3730c02e94ede2de4f25c0bf460c80dcc560a79258a7338b2 SHA512 f05e16f02fbf527875f7246811307b8b224cecd4d305dd59490a2a51444672c7ec769153545c857b5425111c19b8c0c33abbb51fcc8d49c071d31cf32630 diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild new file mode 100644 index ..6afc0cd70a64 --- /dev/null +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="https://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD-2 GPL-2 LGPL-2.1" +SLOT="0/2" +IUSE="logging python static-libs test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" + +RESTRICT="!test? ( test )" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" + +wrap_python() { + if use python; then + # src_prepare + # Do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null || die + fi +} + +src_prepare() { + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + + cmake_src_prepare + wrap_python ${FUNCNAME} + + if use elibc_musl ; then + QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) + fi +} + +src_configure(){ + local mycmakeargs=( + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + -DUNICORN_LOGGING=$(usex logging) + -DUNICORN_LEGACY_STATIC_ARCHIVE=$(usex static-libs) + -DZIG_BUILD=OFF + ) + + cmake_src_configure + + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + + wrap_python ${FUNCNAME} +} + +src_test() { + cmake_src_install + + wrap_python ${FUNCNAME} +} + +python_test() { +# export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + for f in tests/test_*.py; do + if test -x ${f}; then + LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" ${EPYHTON} ${f} || die + fi + done +} + +src_install() { + cmake_src_install + + wrap_python ${FUNCNAME} +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/
commit: ced76873c738bd8b515d7fc4c1799c90d9cc61fd Author: Z. Liu gmail com> AuthorDate: Mon Jan 13 11:08:26 2025 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 09:39:52 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced76873 dev-util/unicorn: fix unexpected implicit function declarations 1. patch merged by upstream at https://github.com/unicorn-engine/unicorn/pull/2085 2. malloc_trim is not available for musl only Closes: https://bugs.gentoo.org/906919 Signed-off-by: Z. Liu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40116 Signed-off-by: Sam James gentoo.org> .../unicorn/files/unicorn-2.0.1-configure.patch| 34 ++ dev-util/unicorn/unicorn-2.0.1-r1.ebuild | 12 dev-util/unicorn/unicorn-2.0.1.ebuild | 13 + dev-util/unicorn/unicorn-2.1.1.ebuild | 11 +++ dev-util/unicorn/unicorn-.ebuild | 10 ++- 5 files changed, 55 insertions(+), 25 deletions(-) diff --git a/dev-util/unicorn/files/unicorn-2.0.1-configure.patch b/dev-util/unicorn/files/unicorn-2.0.1-configure.patch new file mode 100644 index ..57f945e08d37 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.0.1-configure.patch @@ -0,0 +1,34 @@ +From a78d690da54f3afbd3213502c997ba68b29aa404 Mon Sep 17 00:00:00 2001 +From: "Z. Liu" +Date: Tue, 14 Jan 2025 08:47:54 +0800 +Subject: [PATCH] configure: add for clock_adjtime on musl + (#2085) + +for glibc, if _GNU_SOURCE is defined, will include +but not for musl, so add "#include " + +although `man clock_adjtime` said "#include ", but it won't +work for glibc w/o "#include ", I don't known why yet. + +PS it seems clock_adjtime is used nowhere? + +Signed-off-by: Z. Liu +--- + qemu/configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qemu/configure b/qemu/configure +index db820ca1..47d4a4c6 100755 +--- a/qemu/configure b/qemu/configure +@@ -1455,6 +1455,7 @@ fi + clock_adjtime=no + cat > $TMPC < ++#include + + int main(void) + { +-- +2.45.2 + diff --git a/dev-util/unicorn/unicorn-2.0.1-r1.ebuild b/dev-util/unicorn/unicorn-2.0.1-r1.ebuild index ce52142b1b04..43fcd6ebac57 100644 --- a/dev-util/unicorn/unicorn-2.0.1-r1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1-r1.ebuild @@ -37,17 +37,11 @@ BDEPEND="virtual/pkgconfig UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" PATCHES=( + "${FILESDIR}/${PN}-2.0.1-configure.patch" "${FILESDIR}/${P}-strict-prototypes.patch" "${FILESDIR}/${P}-old-style-declaration.patch" ) -# suppress warning wrt 'implicit function declaration' in config logs due to -# auto-detection of some libc functions (bug #906919) -QA_CONFIG_IMPL_DECL_SKIP=( - clock_adjtime - malloc_trim -) - wrap_python() { if use python; then # src_prepare @@ -66,6 +60,10 @@ src_prepare() { cmake_src_prepare wrap_python ${FUNCNAME} + + if use elibc_musl ; then + QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) + fi } src_configure(){ diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index bc7d5c9c0062..43e298db0e08 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,11 +36,8 @@ BDEPEND="virtual/pkgconfig UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" -# suppress warning wrt 'implicit function declaration' in config logs due to -# auto-detection of some libc functions (bug #906919) -QA_CONFIG_IMPL_DECL_SKIP=( - clock_adjtime - malloc_trim +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-configure.patch ) wrap_python() { @@ -61,6 +58,10 @@ src_prepare() { cmake_src_prepare wrap_python ${FUNCNAME} + + if use elibc_musl ; then + QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) + fi } src_configure(){ diff --git a/dev-util/unicorn/unicorn-2.1.1.ebuild b/dev-util/unicorn/unicorn-2.1.1.ebuild index 65e1adba73c3..bec4af229dfd 100644 --- a/dev-util/unicorn/unicorn-2.1.1.ebuild +++ b/dev-util/unicorn/unicorn-2.1.1.ebuild @@ -36,11 +36,8 @@ BDEPEND="virtual/pkgconfig UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" -# suppress warning wrt 'implicit function declaration' in config logs due to -# auto-detection of some libc functions (bug #906919) -QA_CONFIG_IMPL_DECL_SKIP=( - clock_adjtime - malloc_trim +PATCHES=( + "${FILESDIR}"/${PN}-2.0.1-configure.patch ) wrap_python() { @@ -61,6 +58,10 @@ src_prepare() { cmake_src_prepare wrap_python ${FUNCNAME} + + if use elibc_musl ; then + QA_CONFIG_IMPL_DECL_SKIP=( malloc_trim ) + fi } src_configure(){ diff
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 4482e4cbc3ce6a09de78e5437ada2e4a908c6345 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Sep 29 20:12:20 2024 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 06:31:25 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4482e4cb dev-util/unicorn: add 2.1.1 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/metadata.xml | 3 ++ dev-util/unicorn/unicorn-2.1.1.ebuild | 92 +++ 3 files changed, 96 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 7fc46933a0ac..fe438d78e2c7 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1 +1,2 @@ DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f +DIST unicorn-2.1.1.gh.tar.gz 4176172 BLAKE2B 3dd434121418b9a4eb69683cfca6ec0cd019b632492fbfff421eaf26f4907a2f30bf78699b3afe28df624037e3973a5110a6ea21bd233e66a04a689d3e3e5d1c SHA512 d6184b87a0fb729397ec2ac2cb8bfd9d10c9d4276e49efa681c66c7c54d1a325305a920332a708e68989cc299d0d1a543a1ceeaf552a9b44ec93084f7bf85ef2 diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml index 0585a8a2d9d3..50bfe9d49714 100644 --- a/dev-util/unicorn/metadata.xml +++ b/dev-util/unicorn/metadata.xml @@ -9,6 +9,9 @@ s...@gentoo.org Sam James + + Enable logging + unicorn-engine/unicorn unicorn diff --git a/dev-util/unicorn/unicorn-2.1.1.ebuild b/dev-util/unicorn/unicorn-2.1.1.ebuild new file mode 100644 index ..65e1adba73c3 --- /dev/null +++ b/dev-util/unicorn/unicorn-2.1.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="https://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD-2 GPL-2 LGPL-2.1" +SLOT="0/2" +IUSE="logging python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" + +# suppress warning wrt 'implicit function declaration' in config logs due to +# auto-detection of some libc functions (bug #906919) +QA_CONFIG_IMPL_DECL_SKIP=( + clock_adjtime + malloc_trim +) + +wrap_python() { + if use python; then + # src_prepare + # Do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null || die + fi +} + +src_prepare() { + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + + cmake_src_prepare + wrap_python ${FUNCNAME} +} + +src_configure(){ + local mycmakeargs=( + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + -DUNICORN_LOGGING=$(usex logging) + -DZIG_BUILD=OFF + ) + + cmake_src_configure + + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + + wrap_python ${FUNCNAME} +} + +src_install() { + cmake_src_install + + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi + + wrap_python ${FUNCNAME} +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/
commit: d3dd74e856564aac2414a3fca1fd859961ee162f Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Oct 8 11:54:40 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 06:31:24 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3dd74e8 dev-util/unicorn: fix modern C issue Closes: https://bugs.gentoo.org/879685 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> .../unicorn-2.0.1-old-style-declaration.patch | 45 .../files/unicorn-2.0.1-strict-prototypes.patch| 299 + dev-util/unicorn/unicorn-2.0.1-r1.ebuild | 95 +++ 3 files changed, 439 insertions(+) diff --git a/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch b/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch new file mode 100644 index ..b63ffee0c096 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.0.1-old-style-declaration.patch @@ -0,0 +1,45 @@ +commit 9a2583e96710ba49a8fd2a4ab87db7212c1e887c +Upstream: https://github.com/unicorn-engine/unicorn/pull/1886 +Author: Mario Haustein +Date: Sun Oct 8 13:40:23 2023 +0200 + +fix deprecated storage-class declarations + +--- a/qemu/accel/tcg/cputlb.c b/qemu/accel/tcg/cputlb.c +@@ -1415,7 +1415,7 @@ load_memop(const void *haddr, MemOp op) + } + } + +-static uint64_t inline ++static inline uint64_t + load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, + uintptr_t retaddr, MemOp op, bool code_read, + FullLoadHelper *full_load) +@@ -1983,7 +1983,7 @@ uint64_t cpu_ldq_data(CPUArchState *env, target_ulong ptr) + * Store Helpers + */ + +-static void inline ++static inline void + store_memop(void *haddr, uint64_t val, MemOp op) + { + switch (op) { +@@ -2014,7 +2014,7 @@ store_memop(void *haddr, uint64_t val, MemOp op) + } + } + +-static void inline ++static inline void + store_helper(CPUArchState *env, target_ulong addr, uint64_t val, + TCGMemOpIdx oi, uintptr_t retaddr, MemOp op) + { +@@ -2343,7 +2343,7 @@ void helper_be_stq_mmu(CPUArchState *env, target_ulong addr, uint64_t val, + * Store Helpers for cpu_ldst.h + */ + +-static void inline ++static inline void + cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, + int mmu_idx, uintptr_t retaddr, MemOp op) // qq + { diff --git a/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch b/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch new file mode 100644 index ..d8ae8677d837 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.0.1-strict-prototypes.patch @@ -0,0 +1,299 @@ +commit 5983b399d84c534ad2f19461dd38f69e70ea9cfb +Upstream: https://github.com/unicorn-engine/unicorn/pull/1886 +Author: Mario Haustein +Date: Sun Oct 8 13:39:13 2023 +0200 + +use full prototypes for functions without parameters + +--- a/bindings/ruby/unicorn_gem/ext/unicorn.c b/bindings/ruby/unicorn_gem/ext/unicorn.c +@@ -31,7 +31,7 @@ VALUE SavedContext = Qnil; + VALUE Hook = Qnil; + + +-void Init_unicorn_engine() { ++void Init_unicorn_engine(void) { + rb_require("unicorn_engine/unicorn_const"); + UnicornModule = rb_define_module("UnicornEngine"); + UcError = rb_define_class_under(UnicornModule, "UcError", rb_eStandardError); +--- a/samples/mem_apis.c b/samples/mem_apis.c +@@ -193,7 +193,7 @@ static void do_nx_demo(bool cause_fault) + uc_close(uc); + } + +-static void nx_test() ++static void nx_test(void) + { + printf("NX demo - step 1: show that code runs to completion\n"); + do_nx_demo(false); +@@ -276,7 +276,7 @@ static void do_perms_demo(bool change_perms) + uc_close(uc); + } + +-static void perms_test() ++static void perms_test(void) + { + printf("Permissions demo - step 1: show that area is writeable\n"); + do_perms_demo(false); +@@ -355,7 +355,7 @@ static void do_unmap_demo(bool do_unmap) + uc_close(uc); + } + +-static void unmap_test() ++static void unmap_test(void) + { + printf("Unmap demo - step 1: show that area is writeable\n"); + do_unmap_demo(false); +--- a/samples/sample_arm.c b/samples/sample_arm.c +@@ -366,7 +366,7 @@ static void test_thumb_ite_internal(bool step, uint32_t *r2_out, + *r3_out = r3; + } + +-static void test_thumb_ite() ++static void test_thumb_ite(void) + { + uint32_t r2, r3; + uint32_t step_r2, step_r3; +@@ -390,7 +390,7 @@ static void test_thumb_ite() + } + } + +-static void test_read_sctlr() ++static void test_read_sctlr(void) + { + uc_engine *uc; + uc_err err; +--- a/samples/sample_arm64.c b/samples/sample_arm64.c +@@ -197,7 +197,7 @@ static void test_arm64eb(void) + uc_close(uc); + } + +-static void test_arm64_sctlr() ++static void test_arm64_sctlr(void) + { + uc_engine *uc; + uc_err err; +@@ -248,7 +248,7 @@ static uint32_t hook_mrs(uc_engine *uc, uc_arm64_reg reg, + return 1; + } + +-stati
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 52fbe111cc13b15b1f77990b061dee7fcc72251f Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Mon Sep 23 20:17:32 2024 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 06:31:26 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fbe111 dev-util/unicorn: sync live Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/33245 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-.ebuild | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index faf29b762879..65e1adba73c3 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="BSD-2 GPL-2 LGPL-2.1" SLOT="0/2" -IUSE="python static-libs" +IUSE="logging python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} @@ -36,6 +36,13 @@ BDEPEND="virtual/pkgconfig UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" +# suppress warning wrt 'implicit function declaration' in config logs due to +# auto-detection of some libc functions (bug #906919) +QA_CONFIG_IMPL_DECL_SKIP=( + clock_adjtime + malloc_trim +) + wrap_python() { if use python; then # src_prepare @@ -59,6 +66,8 @@ src_prepare() { src_configure(){ local mycmakeargs=( -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + -DUNICORN_LOGGING=$(usex logging) + -DZIG_BUILD=OFF ) cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 7acfa006ff609cc65a222d854bd4112a53026b99 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Oct 8 11:49:34 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 16 06:31:23 2025 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7acfa006 dev-util/unicorn: fix implicit function declarations QA issues Closes: https://bugs.gentoo.org/906919 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 7 +++ 1 file changed, 7 insertions(+) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 16a12869842d..bc7d5c9c0062 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -36,6 +36,13 @@ BDEPEND="virtual/pkgconfig UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" +# suppress warning wrt 'implicit function declaration' in config logs due to +# auto-detection of some libc functions (bug #906919) +QA_CONFIG_IMPL_DECL_SKIP=( + clock_adjtime + malloc_trim +) + wrap_python() { if use python; then # src_prepare
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 87dc0cb32318f9c7349b429fc8543705bdc833ce Author: Sam James gentoo org> AuthorDate: Thu Oct 3 09:46:09 2024 + Commit: Sam James gentoo org> CommitDate: Thu Oct 3 09:46:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87dc0cb3 dev-util/unicorn: enable py3.13 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 4 ++-- dev-util/unicorn/unicorn-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 0cde028e715f..16a12869842d 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index d0e7f926ec3b..faf29b762879 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 394835bf280799cb8905ebc0367d49b331c25745 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Sep 16 09:37:24 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Sep 17 14:55:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394835bf dev-util/unicorn: enable py3.12 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/32830 Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- dev-util/unicorn/unicorn-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 9bc9ba2122c4..0cde028e715f 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 7fa461d2c141..d0e7f926ec3b 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 573cbc7d0e3cd6ef2b2d88da8bfe99e7c96e0977 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Sep 16 08:55:47 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Sep 17 14:55:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573cbc7d dev-util/unicorn: sync live Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 0252a0fdcf05..7fa461d2c141 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~ppc ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 87d326bec13697fc0bea3b5b5824821c56fc70b9 Author: Sam James gentoo org> AuthorDate: Fri Apr 14 19:37:22 2023 + Commit: Sam James gentoo org> CommitDate: Fri Apr 14 19:37:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d326be dev-util/unicorn: Keyword 2.0.1 ppc64, #888513 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index b19f0a48f0ca..9bc9ba2122c4 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 835f35c5cae4af7deaae0c4b99e9213106fa323a Author: Sam James gentoo org> AuthorDate: Fri Apr 14 04:02:56 2023 + Commit: Sam James gentoo org> CommitDate: Fri Apr 14 04:02:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f35c5 dev-util/unicorn: Keyword 2.0.1 arm64, #888513 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 573e188b7e70..b19f0a48f0ca 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm ~ppc ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 48f607727ed6b07ead806770aa0c80f4616663a2 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Feb 25 05:46:54 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Feb 25 05:46:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f60772 dev-util/unicorn: Keyword 2.0.1 arm, #888513 Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 81e4e2c566a2..573e188b7e70 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~ppc ~riscv x86" + KEYWORDS="amd64 ~arm ~ppc ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 44c51bf89a135d047806021c9bfcffab22f8fc18 Author: Yixun Lan gentoo org> AuthorDate: Fri Feb 10 08:43:14 2023 + Commit: Yixun Lan gentoo org> CommitDate: Fri Feb 10 08:43:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c51bf8 dev-util/unicorn: forward keywords to live ebuild Signed-off-by: Yixun Lan gentoo.org> dev-util/unicorn/unicorn-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index b05d7ee97e49..0252a0fdcf05 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~ppc ~riscv ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 8b24a62478b1dab4a64094c42a8fa54cb258d353 Author: Yixun Lan gentoo org> AuthorDate: Fri Feb 10 08:39:27 2023 + Commit: Yixun Lan gentoo org> CommitDate: Fri Feb 10 08:39:27 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b24a624 dev-util/unicorn: Keyword 2.0.1 riscv, #892824 Signed-off-by: Yixun Lan gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 09d6b34fc026..81e4e2c566a2 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~ppc x86" + KEYWORDS="amd64 ~ppc ~riscv x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 81105f6de6cebd32b1169753b8e824ef6b0dedb8 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jan 14 09:59:54 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jan 14 09:59:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81105f6d dev-util/unicorn: Keyword 2.0.1 ppc, #888513 Signed-off-by: Arthur Zamarin gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index b50065f271bc..229ae40afa1a 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~ppc x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/
commit: c1ac9e2da7946cb98e649a8f56c9ca9bc69dd925 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Jan 4 20:18:51 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 5 05:19:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ac9e2d dev-util/unicorn: drop 2.0.0 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 - dev-util/unicorn/files/unicorn-2.0.0-lto.patch | 62 -- dev-util/unicorn/unicorn-2.0.0.ebuild | 87 -- 3 files changed, 150 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 29cc0380f692..7fc46933a0ac 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1 @@ -DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f diff --git a/dev-util/unicorn/files/unicorn-2.0.0-lto.patch b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch deleted file mode 100644 index f6bcda2a18f8.. --- a/dev-util/unicorn/files/unicorn-2.0.0-lto.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit 6d283cf464b82a86f7930e39c91c92ad3cefb58f -Author: mio -Date: Sat Jul 23 20:39:01 2022 +0800 - -Fix ppc symbols clash - -Bug: https://bugs.gentoo.org/872998 -Bug: https://github.com/unicorn-engine/unicorn/issues/1662 - -diff --git a/qemu/ppc.h b/qemu/ppc.h -index 7022629e..eff4b69d 100644 a/qemu/ppc.h -+++ b/qemu/ppc.h -@@ -1708,4 +1708,12 @@ - #define ppc_dcr_init ppc_dcr_init_ppc - #define ppc_cpu_pir ppc_cpu_pir_ppc - #define ppc_irq_reset ppc_irq_reset_ppc -+#define store_booke_tsr store_booke_tsr_ppc -+#define get_pteg_offset32 get_pteg_offset32_ppc -+#define ppc_booke_timers_init ppc_booke_timers_init_ppc -+#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc -+#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc -+#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc -+#define store_booke_tcr store_booke_tcr_ppc -+#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc - #endif -diff --git a/qemu/ppc64.h b/qemu/ppc64.h -index 992caf87..c08ee2d6 100644 a/qemu/ppc64.h -+++ b/qemu/ppc64.h -@@ -1708,4 +1708,12 @@ - #define ppc_dcr_init ppc_dcr_init_ppc64 - #define ppc_cpu_pir ppc_cpu_pir_ppc64 - #define ppc_irq_reset ppc_irq_reset_ppc64 -+#define store_booke_tsr store_booke_tsr_ppc64 -+#define get_pteg_offset32 get_pteg_offset32_ppc64 -+#define ppc_booke_timers_init ppc_booke_timers_init_ppc64 -+#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc64 -+#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc64 -+#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc64 -+#define store_booke_tcr store_booke_tcr_ppc64 -+#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc64 - #endif -diff --git a/symbols.sh b/symbols.sh -index 2968b959..0d426c00 100755 a/symbols.sh -+++ b/symbols.sh -@@ -6264,6 +6264,14 @@ ppc_dcr_register \ - ppc_dcr_init \ - ppc_cpu_pir \ - ppc_irq_reset \ -+store_booke_tsr \ -+get_pteg_offset32 \ -+ppc_booke_timers_init \ -+ppc_hash32_handle_mmu_fault \ -+gen_helper_store_booke_tsr \ -+gen_helper_store_booke_tcr \ -+store_booke_tcr \ -+ppc_hash32_get_phys_page_debug \ - " - - ppc64_SYMBOLS=${ppc_SYMBOLS} diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild deleted file mode 100644 index 76a25d55547e.. --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_/-} - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake distutils-r1 - -DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="https://www.unicorn-engine.org"; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; -else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 x86" -fi - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD-2 GPL-2 LGPL-2.1" -SLOT="0/2" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="${PYTHON_DEPS} -
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 3affc0b76e6967b7045b3c8cac316205f0c1c062 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 07:29:02 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 07:29:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3affc0b7 dev-util/unicorn: Stabilize 2.0.1 x86, #888531 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 34777b117a28..726086d0f242 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 38bdc3dd033858b1b1aae754eadf9fa6286776be Author: Sam James gentoo org> AuthorDate: Tue Dec 27 07:29:03 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 07:29:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bdc3dd dev-util/unicorn: Stabilize 2.0.1 amd64, #888531 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild index 726086d0f242..b50065f271bc 100644 --- a/dev-util/unicorn/unicorn-2.0.1.ebuild +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 x86" + KEYWORDS="amd64 x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 074dee347cb36317b2dc90e3f1de16bb82f846b2 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Tue Nov 1 16:41:36 2022 + Commit: Sam James gentoo org> CommitDate: Sun Nov 6 05:43:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=074dee34 dev-util/unicorn: add 2.0.1 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/28083 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/unicorn-2.0.1.ebuild | 83 +++ 2 files changed, 84 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index bd256c126faa..29cc0380f692 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1 +1,2 @@ DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 +DIST unicorn-2.0.1.gh.tar.gz 4070004 BLAKE2B 4ab8f92367e7df5762d29ed58dfff524f59053e28548b170b982d16988eea16df46851d2ea559d8beabb4f1315e5ee627f9ded755a4f3b1cfd6d863a50c633b6 SHA512 4249d33d38614ea1ca51e38c7838cb276306100aa44c65ad1b3e39304e4b856ac643a9c6f9d13678fc07bea58989a08b64653d17afe9e62bcef2936ba63e1b1f diff --git a/dev-util/unicorn/unicorn-2.0.1.ebuild b/dev-util/unicorn/unicorn-2.0.1.ebuild new file mode 100644 index ..34777b117a28 --- /dev/null +++ b/dev-util/unicorn/unicorn-2.0.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{8..11} ) +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="https://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD-2 GPL-2 LGPL-2.1" +SLOT="0/2" +IUSE="python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" + +wrap_python() { + if use python; then + # src_prepare + # Do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null || die + fi +} + +src_prepare() { + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + + cmake_src_prepare + wrap_python ${FUNCNAME} +} + +src_configure(){ + local mycmakeargs=( + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + ) + + cmake_src_configure + + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + + wrap_python ${FUNCNAME} +} + +src_install() { + cmake_src_install + + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi + + wrap_python ${FUNCNAME} +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/
commit: 57caf57304f4f4568c86886b0498b6707ea747f1 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Mon Sep 26 21:57:35 2022 + Commit: Sam James gentoo org> CommitDate: Sat Oct 1 03:15:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57caf573 dev-util/unicorn: fix lto type mismatch Closes: https://bugs.gentoo.org/858506 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/27484 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/files/unicorn-2.0.0-lto.patch | 62 ++ dev-util/unicorn/unicorn-2.0.0.ebuild | 4 ++ 2 files changed, 66 insertions(+) diff --git a/dev-util/unicorn/files/unicorn-2.0.0-lto.patch b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch new file mode 100644 index ..f6bcda2a18f8 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch @@ -0,0 +1,62 @@ +commit 6d283cf464b82a86f7930e39c91c92ad3cefb58f +Author: mio +Date: Sat Jul 23 20:39:01 2022 +0800 + +Fix ppc symbols clash + +Bug: https://bugs.gentoo.org/872998 +Bug: https://github.com/unicorn-engine/unicorn/issues/1662 + +diff --git a/qemu/ppc.h b/qemu/ppc.h +index 7022629e..eff4b69d 100644 +--- a/qemu/ppc.h b/qemu/ppc.h +@@ -1708,4 +1708,12 @@ + #define ppc_dcr_init ppc_dcr_init_ppc + #define ppc_cpu_pir ppc_cpu_pir_ppc + #define ppc_irq_reset ppc_irq_reset_ppc ++#define store_booke_tsr store_booke_tsr_ppc ++#define get_pteg_offset32 get_pteg_offset32_ppc ++#define ppc_booke_timers_init ppc_booke_timers_init_ppc ++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc ++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc ++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc ++#define store_booke_tcr store_booke_tcr_ppc ++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc + #endif +diff --git a/qemu/ppc64.h b/qemu/ppc64.h +index 992caf87..c08ee2d6 100644 +--- a/qemu/ppc64.h b/qemu/ppc64.h +@@ -1708,4 +1708,12 @@ + #define ppc_dcr_init ppc_dcr_init_ppc64 + #define ppc_cpu_pir ppc_cpu_pir_ppc64 + #define ppc_irq_reset ppc_irq_reset_ppc64 ++#define store_booke_tsr store_booke_tsr_ppc64 ++#define get_pteg_offset32 get_pteg_offset32_ppc64 ++#define ppc_booke_timers_init ppc_booke_timers_init_ppc64 ++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc64 ++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc64 ++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc64 ++#define store_booke_tcr store_booke_tcr_ppc64 ++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc64 + #endif +diff --git a/symbols.sh b/symbols.sh +index 2968b959..0d426c00 100755 +--- a/symbols.sh b/symbols.sh +@@ -6264,6 +6264,14 @@ ppc_dcr_register \ + ppc_dcr_init \ + ppc_cpu_pir \ + ppc_irq_reset \ ++store_booke_tsr \ ++get_pteg_offset32 \ ++ppc_booke_timers_init \ ++ppc_hash32_handle_mmu_fault \ ++gen_helper_store_booke_tsr \ ++gen_helper_store_booke_tcr \ ++store_booke_tcr \ ++ppc_hash32_get_phys_page_debug \ + " + + ppc64_SYMBOLS=${ppc_SYMBOLS} diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild index b50065f271bc..76a25d55547e 100644 --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -34,6 +34,10 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" +PATCHES=( + "${FILESDIR}/${P}-lto.patch" +) + UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" wrap_python() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: aa522856a7d27338104858f244770afb67748c55 Author: Sam James gentoo org> AuthorDate: Thu Aug 4 22:52:21 2022 + Commit: Sam James gentoo org> CommitDate: Thu Aug 4 22:52:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa522856 dev-util/unicorn: Stabilize 2.0.0 x86, #863476 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild index 18701c9161ee..b50065f271bc 100644 --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 2734737cc9d2d49e157509a13808c53f07d36bf5 Author: Sam James gentoo org> AuthorDate: Thu Aug 4 22:51:37 2022 + Commit: Sam James gentoo org> CommitDate: Thu Aug 4 22:51:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2734737c dev-util/unicorn: Stabilize 2.0.0 amd64, #863476 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild index 34777b117a28..18701c9161ee 100644 --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; then EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 3c90cf386010fc237ed7688dab2833e5cf72a600 Author: Sam James gentoo org> AuthorDate: Tue Jul 26 04:23:33 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 26 04:25:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c90cf38 dev-util/unicorn: drop 2.0.0_rc7 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 - dev-util/unicorn/unicorn-2.0.0_rc7.ebuild | 80 --- 2 files changed, 81 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 0f0d9b61f012..bd256c126faa 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1 @@ DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 -DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e diff --git a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild deleted file mode 100644 index 8b343753397d.. --- a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_/-} - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake distutils-r1 - -DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="https://www.unicorn-engine.org"; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; -else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD-2 GPL-2 LGPL-2.1" -SLOT="0/2" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="${PYTHON_DEPS} - dev-libs/glib:2" -RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig - python? ( ${DISTUTILS_DEPS} )" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" - -wrap_python() { - if use python; then - # src_prepare - # Do not compile C extensions - export LIBUNICORN_PATH=1 - - pushd bindings/python >/dev/null || die - distutils-r1_${1} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - # Build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" - - cmake_src_prepare - wrap_python ${FUNCNAME} -} - -src_configure(){ - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" - ) - - cmake_src_configure - - wrap_python ${FUNCNAME} -} - -src_compile() { - cmake_src_compile - - wrap_python ${FUNCNAME} -} - -src_install() { - cmake_src_install - - wrap_python ${FUNCNAME} -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 590eb4267dd753b6448f750d487211c15c32b648 Author: Sam James gentoo org> AuthorDate: Sat Jul 9 10:16:28 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 9 10:16:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590eb426 dev-util/unicorn: drop redundant BUILD_SHARED_LIBS cmake.eclass does this for us Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0.ebuild | 1 - dev-util/unicorn/unicorn-.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild index ca4d4202c790..34777b117a28 100644 --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -58,7 +58,6 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=yes -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" ) diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index ca4d4202c790..34777b117a28 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -58,7 +58,6 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=yes -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" )
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 67dad0f953041cebde55bf5d4d05bf40b6b2aa2e Author: Sam James gentoo org> AuthorDate: Sat Jul 9 10:15:54 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 9 10:15:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67dad0f9 dev-util/unicorn: fix PythonGHDistfileSuffix Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 2 +- dev-util/unicorn/unicorn-2.0.0.ebuild | 2 +- dev-util/unicorn/unicorn-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 6bb09c630fce..0f0d9b61f012 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1,2 @@ -DIST unicorn-2.0.0.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 +DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild index 1f771828950f..ca4d4202c790 100644 --- a/dev-util/unicorn/unicorn-2.0.0.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~x86" fi diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 1f771828950f..ca4d4202c790 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~x86" fi
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: d12375dc8fab5e66fce4132e8d797e6ba1a73c28 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Thu Jul 7 18:18:42 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 9 10:14:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12375dc dev-util/unicorn: version bump 2.0.0 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/26270 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest| 1 + .../unicorn/{unicorn-.ebuild => unicorn-2.0.0.ebuild}| 12 dev-util/unicorn/unicorn-.ebuild | 12 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index b79c53ef4965..6bb09c630fce 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1 +1,2 @@ +DIST unicorn-2.0.0.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789 DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild similarity index 88% copy from dev-util/unicorn/unicorn-.ebuild copy to dev-util/unicorn/unicorn-2.0.0.ebuild index 01c1ff6ba6bf..1f771828950f 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" @@ -34,12 +34,12 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" wrap_python() { if use python; then # src_prepare - # do not compile C extensions + # Do not compile C extensions export LIBUNICORN_PATH=1 pushd bindings/python >/dev/null || die @@ -58,7 +58,7 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DBUILD_SHARED_LIBS=yes -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" ) @@ -76,5 +76,9 @@ src_compile() { src_install() { cmake_src_install + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi + wrap_python ${FUNCNAME} } diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 01c1ff6ba6bf..1f771828950f 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" @@ -34,12 +34,12 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" wrap_python() { if use python; then # src_prepare - # do not compile C extensions + # Do not compile C extensions export LIBUNICORN_PATH=1 pushd bindings/python >/dev/null || die @@ -58,7 +58,7 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DBUILD_SHARED_LIBS=yes -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" ) @@ -76,5 +76,9 @@ src_compile() { src_install() { cmake_src_install + if ! use static-libs; then + find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die + fi + wrap_python ${FUNCNAME} }
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 9fec686abf789fdff36a90c3763d9558203cbf9a Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Thu Jun 2 21:53:37 2022 + Commit: Michał Górny gentoo org> CommitDate: Fri Jun 3 07:10:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fec686a dev-util/unicorn: remove old Bug: https://bugs.gentoo.org/849395 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/25733 Signed-off-by: Michał Górny gentoo.org> dev-util/unicorn/Manifest | 1 - dev-util/unicorn/unicorn-2.0.0_rc6.ebuild | 80 --- 2 files changed, 81 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 7b99a7f736b8..b79c53ef4965 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1 @@ -DIST unicorn-2.0.0_rc6.tar.gz 3968714 BLAKE2B dcb42126b8a2b9f0780977c73f5e170b5ad438c4f0eca82293e47d52575de27f18440a2d71b9cd17d7b488ae1d46c8197eabbbf7fd92f196bfb7d46c197937fd SHA512 a80a9408bc5b41b6961049849a8a63f69399325a4e4d8e41f4512173d24a837048d9ac03064bc16eb129e5f52828507baa059fda64430ec52b4f9ef339d61f0d DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e diff --git a/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild deleted file mode 100644 index 01c1ff6ba6bf.. --- a/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_/-} - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..10} ) -inherit cmake distutils-r1 - -DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="https://www.unicorn-engine.org"; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; -else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD-2 GPL-2 LGPL-2.1" -SLOT="0/2" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="${PYTHON_DEPS} - dev-libs/glib:2" -RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig - python? ( ${DISTUTILS_DEPS} )" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" - -wrap_python() { - if use python; then - # src_prepare - # do not compile C extensions - export LIBUNICORN_PATH=1 - - pushd bindings/python >/dev/null || die - distutils-r1_${1} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - # Build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" - - cmake_src_prepare - wrap_python ${FUNCNAME} -} - -src_configure(){ - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" - ) - - cmake_src_configure - - wrap_python ${FUNCNAME} -} - -src_compile() { - cmake_src_compile - - wrap_python ${FUNCNAME} -} - -src_install() { - cmake_src_install - - wrap_python ${FUNCNAME} -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: c81dca32a29749266dd6e06ce4946fa9aef95cea Author: Sam James gentoo org> AuthorDate: Mon May 16 05:21:38 2022 + Commit: Sam James gentoo org> CommitDate: Mon May 16 05:21:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81dca32 dev-util/unicorn: enable py3.8; add pypi remote-id Signed-off-by: Sam James gentoo.org> dev-util/unicorn/metadata.xml | 1 + dev-util/unicorn/unicorn-2.0.0_rc7.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml index ce9705eab55c..0585a8a2d9d3 100644 --- a/dev-util/unicorn/metadata.xml +++ b/dev-util/unicorn/metadata.xml @@ -11,5 +11,6 @@ unicorn-engine/unicorn + unicorn diff --git a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild index 01c1ff6ba6bf..8b343753397d 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild @@ -7,7 +7,7 @@ MY_PV=${PV/_/-} DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" @@ -39,7 +39,7 @@ UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" wrap_python() { if use python; then # src_prepare - # do not compile C extensions + # Do not compile C extensions export LIBUNICORN_PATH=1 pushd bindings/python >/dev/null || die
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 57fb6dcae199c37d22df24445d287cacb65f5556 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Tue Apr 19 19:34:14 2022 + Commit: Sam James gentoo org> CommitDate: Mon May 16 05:19:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fb6dca dev-util/unicorn: version bump 2.0.0-rc7 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/25115 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/unicorn-2.0.0_rc7.ebuild | 80 +++ 2 files changed, 81 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 300b01d9f9f5..7b99a7f736b8 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1 +1,2 @@ DIST unicorn-2.0.0_rc6.tar.gz 3968714 BLAKE2B dcb42126b8a2b9f0780977c73f5e170b5ad438c4f0eca82293e47d52575de27f18440a2d71b9cd17d7b488ae1d46c8197eabbbf7fd92f196bfb7d46c197937fd SHA512 a80a9408bc5b41b6961049849a8a63f69399325a4e4d8e41f4512173d24a837048d9ac03064bc16eb129e5f52828507baa059fda64430ec52b4f9ef339d61f0d +DIST unicorn-2.0.0_rc7.tar.gz 3984228 BLAKE2B a3e6a0d6084780b3a47837a6c8f9df9ec0eb176ff041881fbf2dc879eee11c70796b4f8e4ba784f553e383b8537abe9a559e627afc2fcaf712e83bfc5daaf11c SHA512 ae7e2b35032a8cff516f27edc58ab41708c2acd05b8feebb127501d0bc990a6722ba8439876ea147a2025372500d5df4bd7db86fddf215be63d070218a85a27e diff --git a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild new file mode 100644 index ..01c1ff6ba6bf --- /dev/null +++ b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{9..10} ) +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="https://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD-2 GPL-2 LGPL-2.1" +SLOT="0/2" +IUSE="python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig + python? ( ${DISTUTILS_DEPS} )" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" + +wrap_python() { + if use python; then + # src_prepare + # do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null || die + fi +} + +src_prepare() { + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + + cmake_src_prepare + wrap_python ${FUNCNAME} +} + +src_configure(){ + local mycmakeargs=( + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" + ) + + cmake_src_configure + + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + + wrap_python ${FUNCNAME} +} + +src_install() { + cmake_src_install + + wrap_python ${FUNCNAME} +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: f1179243cc0fa5751936c32af5274d5ffd12a659 Author: Sam James gentoo org> AuthorDate: Sun Apr 17 16:36:01 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 17 16:36:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1179243 dev-util/unicorn: drop 2.0.0_rc5 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 - dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 81 --- 2 files changed, 82 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index ee6494e5c5ad..300b01d9f9f5 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1,2 +1 @@ -DIST unicorn-2.0.0_rc5.tar.gz 3808762 BLAKE2B 02a77c46e075f67df04a9fe0b5474df9f6a6c154778de3223c6ed3c475bd4658abd7b57d351a63cfa7ef5ecbadbee12a6151957b7b47b4f6741b5e4581d13c4b SHA512 3b5118e378872a50d3aa0dca01cda69b0e7b3875da7b03c1708963848c71818dd1e120df8796acace661c6b4d63813b9acc8106ce3a94c0d40c3b50677fbaacd DIST unicorn-2.0.0_rc6.tar.gz 3968714 BLAKE2B dcb42126b8a2b9f0780977c73f5e170b5ad438c4f0eca82293e47d52575de27f18440a2d71b9cd17d7b488ae1d46c8197eabbbf7fd92f196bfb7d46c197937fd SHA512 a80a9408bc5b41b6961049849a8a63f69399325a4e4d8e41f4512173d24a837048d9ac03064bc16eb129e5f52828507baa059fda64430ec52b4f9ef339d61f0d diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild deleted file mode 100644 index e2bdf4b08071.. --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV=${PV/_/-} - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..10} ) -inherit cmake distutils-r1 - -DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="https://www.unicorn-engine.org"; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; -else - SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD-2 GPL-2 LGPL-2.1" -SLOT="0/2" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="${PYTHON_DEPS} - dev-libs/glib:2" -RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig - python? ( ${DISTUTILS_DEPS} )" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" - -wrap_python() { - if use python; then - # src_prepare - # do not compile C extensions - export LIBUNICORN_PATH=1 - - pushd bindings/python >/dev/null || die - distutils-r1_${1} "$@" - popd >/dev/null || die - fi -} - -src_prepare() { - # Build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" - - cmake_src_prepare - wrap_python ${FUNCNAME} -} - -src_configure(){ - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED=$(usex !static-libs) - -DUNICORN_ARCH="${UNICORN_TARGETS}" - ) - - cmake_src_configure - - wrap_python ${FUNCNAME} -} - -src_compile() { - cmake_src_compile - - wrap_python ${FUNCNAME} -} - -src_install() { - cmake_src_install - - wrap_python ${FUNCNAME} -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: ee37d37ec06466b9bcbcb2250f300583800f2825 Author: Matthew Smith gentoo org> AuthorDate: Sun Mar 13 09:20:07 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sun Mar 13 09:20:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee37d37e dev-util/unicorn: update LICENSE Signed-off-by: Matthew Smith gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 2 +- dev-util/unicorn/unicorn-2.0.0_rc6.ebuild | 2 +- dev-util/unicorn/unicorn-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index 2a6b0fe4d2b8..e2bdf4b08071 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -23,7 +23,7 @@ fi S="${WORKDIR}/${PN}-${MY_PV}" -LICENSE="GPL-2" +LICENSE="BSD-2 GPL-2 LGPL-2.1" SLOT="0/2" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild index b308066f0b27..01c1ff6ba6bf 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild @@ -23,7 +23,7 @@ fi S="${WORKDIR}/${PN}-${MY_PV}" -LICENSE="GPL-2" +LICENSE="BSD-2 GPL-2 LGPL-2.1" SLOT="0/2" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index b308066f0b27..01c1ff6ba6bf 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -23,7 +23,7 @@ fi S="${WORKDIR}/${PN}-${MY_PV}" -LICENSE="GPL-2" +LICENSE="BSD-2 GPL-2 LGPL-2.1" SLOT="0/2" IUSE="python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 10c878dacb61a4bafe24e0a04ddaf91480b54e81 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Fri Mar 11 06:56:07 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sun Mar 13 09:13:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c878da dev-util/unicorn: version bump 2.0.0-rc6 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/24481 Signed-off-by: Matthew Smith gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/{unicorn-.ebuild => unicorn-2.0.0_rc6.ebuild} | 7 +++ dev-util/unicorn/unicorn-.ebuild | 7 +++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest index 2566a0abfced..ee6494e5c5ad 100644 --- a/dev-util/unicorn/Manifest +++ b/dev-util/unicorn/Manifest @@ -1 +1,2 @@ DIST unicorn-2.0.0_rc5.tar.gz 3808762 BLAKE2B 02a77c46e075f67df04a9fe0b5474df9f6a6c154778de3223c6ed3c475bd4658abd7b57d351a63cfa7ef5ecbadbee12a6151957b7b47b4f6741b5e4581d13c4b SHA512 3b5118e378872a50d3aa0dca01cda69b0e7b3875da7b03c1708963848c71818dd1e120df8796acace661c6b4d63813b9acc8106ce3a94c0d40c3b50677fbaacd +DIST unicorn-2.0.0_rc6.tar.gz 3968714 BLAKE2B dcb42126b8a2b9f0780977c73f5e170b5ad438c4f0eca82293e47d52575de27f18440a2d71b9cd17d7b488ae1d46c8197eabbbf7fd92f196bfb7d46c197937fd SHA512 a80a9408bc5b41b6961049849a8a63f69399325a4e4d8e41f4512173d24a837048d9ac03064bc16eb129e5f52828507baa059fda64430ec52b4f9ef339d61f0d diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild similarity index 89% copy from dev-util/unicorn/unicorn-.ebuild copy to dev-util/unicorn/unicorn-2.0.0_rc6.ebuild index 2a6b0fe4d2b8..b308066f0b27 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc6.ebuild @@ -34,7 +34,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" wrap_python() { if use python; then @@ -58,9 +58,8 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED=$(usex !static-libs) - -DUNICORN_ARCH="${UNICORN_TARGETS}" + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" ) cmake_src_configure diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 2a6b0fe4d2b8..b308066f0b27 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -34,7 +34,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} )" BDEPEND="virtual/pkgconfig python? ( ${DISTUTILS_DEPS} )" -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x" wrap_python() { if use python; then @@ -58,9 +58,8 @@ src_prepare() { src_configure(){ local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED=$(usex !static-libs) - -DUNICORN_ARCH="${UNICORN_TARGETS}" + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DUNICORN_ARCH="${UNICORN_TARGETS// /;}" ) cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 866952d86fc60ca297558c7c4fe8e06ec43afb9c Author: Sam James gentoo org> AuthorDate: Mon Jan 31 20:38:50 2022 + Commit: Sam James gentoo org> CommitDate: Wed Feb 2 01:04:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=866952d8 dev-util/unicorn: update for distutlis-r1.eclass' DISTUTILS_DEPS var Bug: https://bugs.gentoo.org/832337 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 8 +--- dev-util/unicorn/unicorn-.ebuild | 8 +--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index 8687e522b5a0..2a6b0fe4d2b8 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -31,14 +31,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -# See bug #832337 re Python deps BDEPEND="virtual/pkgconfig - python? ( - >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" + python? ( ${DISTUTILS_DEPS} )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 8687e522b5a0..2a6b0fe4d2b8 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -31,14 +31,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -# See bug #832337 re Python deps BDEPEND="virtual/pkgconfig - python? ( - >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" + python? ( ${DISTUTILS_DEPS} )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 3c7c7194dcd4b12cfeed0aae4222974015a97e6e Author: Sam James gentoo org> AuthorDate: Mon Jan 31 03:18:06 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jan 31 03:19:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7c7194 dev-util/unicorn: fix Python dependencies (BDEPEND) I'm not sure there's anything distutils-r1.eclass can do for us here, so it is what it is, but we need to inline the deps from the eclass as we've set DISTUTILS_OPTIONAL to only do the Python parts w/ USE=python. Closes: https://bugs.gentoo.org/832337 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 9 - dev-util/unicorn/unicorn-.ebuild | 10 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index 1a1090444ff1..8687e522b5a0 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -31,7 +31,14 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig" +# See bug #832337 re Python deps +BDEPEND="virtual/pkgconfig + python? ( + >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index 0c2d81bebca9..8687e522b5a0 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -5,6 +5,7 @@ EAPI=8 MY_PV=${PV/_/-} +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 @@ -30,7 +31,14 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="${PYTHON_DEPS} dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" -BDEPEND="virtual/pkgconfig" +# See bug #832337 re Python deps +BDEPEND="virtual/pkgconfig + python? ( + >=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc"
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 7390194577918423b12d2cd389c0d6c56b678335 Author: Sam James gentoo org> AuthorDate: Fri Jan 28 08:19:52 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jan 28 08:19:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73901945 dev-util/unicorn: add proxied attribute Signed-off-by: Sam James gentoo.org> dev-util/unicorn/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml index 0c34d21d4fdd..ce9705eab55c 100644 --- a/dev-util/unicorn/metadata.xml +++ b/dev-util/unicorn/metadata.xml @@ -1,7 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + mario.haust...@hrz.tu-chemnitz.de Mario Haustein
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: 64bedcd835cc05c4397317c094909d3764f2ba56 Author: Sam James gentoo org> AuthorDate: Fri Jan 28 04:40:40 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jan 28 05:16:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bedcd8 dev-util/unicorn: minor cleanups - Define subslot (tools like this often end up breaking ABI and it's useful to set it proactively here) - Use PEP517 - Add a missing `|| die` - Minor whitespace changes - HTTPSify HOMEPAGE See: https://github.com/gentoo/gentoo/pull/23806 Signed-off-by: Sam James gentoo.org> dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 31 +-- dev-util/unicorn/unicorn-.ebuild | 30 -- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild index c0be1c278b68..1a1090444ff1 100644 --- a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -5,12 +5,13 @@ EAPI=8 MY_PV=${PV/_/-} +DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="http://www.unicorn-engine.org"; +HOMEPAGE="https://www.unicorn-engine.org"; if [[ ${PV} == * ]]; then inherit git-r3 @@ -20,21 +21,19 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="GPL-2" -SLOT="0" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +S="${WORKDIR}/${PN}-${MY_PV}" +LICENSE="GPL-2" +SLOT="0/2" IUSE="python static-libs" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="dev-libs/glib:2 - virtual/pkgconfig - ${PYTHON_DEPS}" +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}-${MY_PV}" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" wrap_python() { if use python; then @@ -44,13 +43,14 @@ wrap_python() { pushd bindings/python >/dev/null || die distutils-r1_${1} "$@" - popd >/dev/null + popd >/dev/null || die fi } src_prepare() { - # build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuild" + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + cmake_src_prepare wrap_python ${FUNCNAME} } @@ -58,15 +58,18 @@ src_prepare() { src_configure(){ local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED="$(usex static-libs OFF ON)" + -DUNICORN_BUILD_SHARED=$(usex !static-libs) -DUNICORN_ARCH="${UNICORN_TARGETS}" ) + cmake_src_configure + wrap_python ${FUNCNAME} } src_compile() { cmake_src_compile + wrap_python ${FUNCNAME} } diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild index c0be1c278b68..0c2d81bebca9 100644 --- a/dev-util/unicorn/unicorn-.ebuild +++ b/dev-util/unicorn/unicorn-.ebuild @@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{9..10} ) inherit cmake distutils-r1 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" -HOMEPAGE="http://www.unicorn-engine.org"; +HOMEPAGE="https://www.unicorn-engine.org"; if [[ ${PV} == * ]]; then inherit git-r3 @@ -20,21 +20,19 @@ else KEYWORDS="~amd64 ~x86" fi -LICENSE="GPL-2" -SLOT="0" - -UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" +S="${WORKDIR}/${PN}-${MY_PV}" +LICENSE="GPL-2" +SLOT="0/2" IUSE="python static-libs" - REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DEPEND="dev-libs/glib:2 - virtual/pkgconfig - ${PYTHON_DEPS}" +DEPEND="${PYTHON_DEPS} + dev-libs/glib:2" RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}-${MY_PV}" +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" wrap_python() { if use python; then @@ -44,13 +42,14 @@ wrap_python() { pushd bindings/python >/dev/null || die distutils-r1_${1} "$@" - popd >/dev/null + popd >/dev/null || die fi } src_prepare() { - # build from sources - rm -r bindings/python/prebuilt || die "failed to remove prebuild" + # Build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuilt files" + cmake_src_prepare wrap_python ${FUNCNAME} } @@ -58,15 +57,18 @@ src_prepare() { src_configure(){ local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF - -DUNICORN_BUILD_SHARED="$(usex static-libs OFF ON)" + -DUNICORN_BUILD_SHARED=$(usex !static-libs) -DUNICORN_A
[gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/
commit: e3c69f09ccb7c5203b683b9a878aa4a90959f745 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Jan 15 12:39:10 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jan 28 05:16:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c69f09 dev-util/unicorn: new ebuild Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/Manifest | 1 + dev-util/unicorn/metadata.xml | 15 ++ dev-util/unicorn/unicorn-2.0.0_rc5.ebuild | 77 +++ dev-util/unicorn/unicorn-.ebuild | 77 +++ 4 files changed, 170 insertions(+) diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest new file mode 100644 index ..2566a0abfced --- /dev/null +++ b/dev-util/unicorn/Manifest @@ -0,0 +1 @@ +DIST unicorn-2.0.0_rc5.tar.gz 3808762 BLAKE2B 02a77c46e075f67df04a9fe0b5474df9f6a6c154778de3223c6ed3c475bd4658abd7b57d351a63cfa7ef5ecbadbee12a6151957b7b47b4f6741b5e4581d13c4b SHA512 3b5118e378872a50d3aa0dca01cda69b0e7b3875da7b03c1708963848c71818dd1e120df8796acace661c6b4d63813b9acc8106ce3a94c0d40c3b50677fbaacd diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml new file mode 100644 index ..0c34d21d4fdd --- /dev/null +++ b/dev-util/unicorn/metadata.xml @@ -0,0 +1,15 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + + mario.haust...@hrz.tu-chemnitz.de + Mario Haustein + + + s...@gentoo.org + Sam James + + + unicorn-engine/unicorn + + diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild new file mode 100644 index ..c0be1c278b68 --- /dev/null +++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{9..10} ) +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="http://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" + +IUSE="python static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="dev-libs/glib:2 + virtual/pkgconfig + ${PYTHON_DEPS}" +RDEPEND="python? ( ${PYTHON_DEPS} )" + +S="${WORKDIR}/${PN}-${MY_PV}" + +wrap_python() { + if use python; then + # src_prepare + # do not compile C extensions + export LIBUNICORN_PATH=1 + + pushd bindings/python >/dev/null || die + distutils-r1_${1} "$@" + popd >/dev/null + fi +} + +src_prepare() { + # build from sources + rm -r bindings/python/prebuilt || die "failed to remove prebuild" + cmake_src_prepare + wrap_python ${FUNCNAME} +} + +src_configure(){ + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DUNICORN_BUILD_SHARED="$(usex static-libs OFF ON)" + -DUNICORN_ARCH="${UNICORN_TARGETS}" + ) + cmake_src_configure + wrap_python ${FUNCNAME} +} + +src_compile() { + cmake_src_compile + wrap_python ${FUNCNAME} +} + +src_install() { + cmake_src_install + + wrap_python ${FUNCNAME} +} diff --git a/dev-util/unicorn/unicorn-.ebuild b/dev-util/unicorn/unicorn-.ebuild new file mode 100644 index ..c0be1c278b68 --- /dev/null +++ b/dev-util/unicorn/unicorn-.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=${PV/_/-} + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{9..10} ) +inherit cmake distutils-r1 + +DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework" +HOMEPAGE="http://www.unicorn-engine.org"; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"; +else + SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc" + +IUSE="python static-libs" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND="dev-libs/glib:2 + virtual/pkgconfig + ${PYTHON_DEPS}" +RDEPEND="python? ( ${PYTHON_DEPS} )" + +S="${WORKDIR}/$