From c34fe7b3406a8380b29fa9f37ef2df2eabb1e0e2 Mon Sep 17 00:00:00 2001 From: "Brian M. Waters" Date: Thu, 10 Aug 2017 12:16:05 -0400 Subject: [PATCH 1/3] unicorn: add static-libs use flag --- dev-util/unicorn/unicorn-1.0.1-r2.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-util/unicorn/unicorn-1.0.1-r2.ebuild b/dev-util/unicorn/unicorn-1.0.1-r2.ebuild index d8f93d3e3..1c5fc6689 100644 --- a/dev-util/unicorn/unicorn-1.0.1-r2.ebuild +++ b/dev-util/unicorn/unicorn-1.0.1-r2.ebuild @@ -13,6 +13,7 @@ SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${PV}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~m68k ~arm ~arm64 ~mips ~sparc" +IUSE="static-libs" IUSE_UNICORN_TARGETS="x86 m68k arm aarch64 mips sparc" use_unicorn_targets=$(printf ' unicorn_targets_%s' ${IUSE_UNICORN_TARGETS}) @@ -40,9 +41,9 @@ src_configure(){ } src_compile() { - UNICORN_ARCHS="${unicorn_targets}" ./make.sh + UNICORN_ARCHS="${unicorn_targets}" UNICORN_STATIC="$(use static-libs && echo yes || echo no)" ./make.sh } src_install() { - emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" install + emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" UNICORN_STATIC="$(use static-libs && echo yes || echo no)" install } From 1982f3b8ded54e3849c07dc64f4519de423b12cb Mon Sep 17 00:00:00 2001 From: "Brian M. Waters" Date: Thu, 10 Aug 2017 12:21:48 -0400 Subject: [PATCH 2/3] unicorn: add arm and aarch64 to base profile --- profiles/pentoo/arch/amd64/make.defaults | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/pentoo/arch/amd64/make.defaults b/profiles/pentoo/arch/amd64/make.defaults index c911567ba..2615fcdcd 100644 --- a/profiles/pentoo/arch/amd64/make.defaults +++ b/profiles/pentoo/arch/amd64/make.defaults @@ -6,4 +6,6 @@ FCFLAGS="${CFLAGS}" QEMU_SOFTMMU_TARGETS="arm aarch64 i386 x86_64" QEMU_USER_TARGETS="arm aarch64 i386 x86_64" +UNICORN_TARGETS="arm aarch64 x86" + GRUB_PLATFORMS="coreboot efi-32 efi-64 emu multiboot pc qemu" From ae93c21928ff2f197beba9f7067c0bcc867295a2 Mon Sep 17 00:00:00 2001 From: "Brian M. Waters" Date: Thu, 10 Aug 2017 16:48:44 -0400 Subject: [PATCH 3/3] Revert "unicorn: add arm and aarch64 to base profile" This reverts commit 1982f3b8ded54e3849c07dc64f4519de423b12cb. Certain combinations of architectures cause the build to break; needs further work. --- profiles/pentoo/arch/amd64/make.defaults | 2 -- 1 file changed, 2 deletions(-) diff --git a/profiles/pentoo/arch/amd64/make.defaults b/profiles/pentoo/arch/amd64/make.defaults index 2615fcdcd..c911567ba 100644 --- a/profiles/pentoo/arch/amd64/make.defaults +++ b/profiles/pentoo/arch/amd64/make.defaults @@ -6,6 +6,4 @@ FCFLAGS="${CFLAGS}" QEMU_SOFTMMU_TARGETS="arm aarch64 i386 x86_64" QEMU_USER_TARGETS="arm aarch64 i386 x86_64" -UNICORN_TARGETS="arm aarch64 x86" - GRUB_PLATFORMS="coreboot efi-32 efi-64 emu multiboot pc qemu"