From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28BA815800F for ; Thu, 5 Jan 2023 05:21:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02CD0E085E; Thu, 5 Jan 2023 05:21:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D904CE085E for ; Thu, 5 Jan 2023 05:21:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 909FC340F03 for ; Thu, 5 Jan 2023 05:21:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1E9F836 for ; Thu, 5 Jan 2023 05:21:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672895997.c1ac9e2da7946cb98e649a8f56c9ca9bc69dd925.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/unicorn/Manifest dev-util/unicorn/files/unicorn-2.0.0-lto.patch dev-util/unicorn/unicorn-2.0.0.ebuild X-VCS-Directories: dev-util/unicorn/files/ dev-util/unicorn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c1ac9e2da7946cb98e649a8f56c9ca9bc69dd925 X-VCS-Branch: master Date: Thu, 5 Jan 2023 05:21:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ee6f119f-6c75-472d-8d0c-6c3c1c603cd8 X-Archives-Hash: 4ada364d8ea04a8976efc534d35ec59a commit: c1ac9e2da7946cb98e649a8f56c9ca9bc69dd925 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Jan 4 20:18:51 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 5 05:19:57 2023 +0000 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..000000000000 --- 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..000000000000 --- 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} == *9999 ]]; 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} )" - -PATCHES=( - "${FILESDIR}/${P}-lto.patch" -) - -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} -}