diff options
Diffstat (limited to 'sci-electronics/ghdl')
| -rw-r--r-- | sci-electronics/ghdl/Manifest | 3 | ||||
| -rw-r--r-- | sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild (renamed from sci-electronics/ghdl/ghdl-4.0.0-r1.ebuild) | 30 |
2 files changed, 21 insertions, 12 deletions
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest index 86b40ce65f14..e6e42b5d9b9a 100644 --- a/sci-electronics/ghdl/Manifest +++ b/sci-electronics/ghdl/Manifest @@ -1,6 +1,5 @@ AUX ghdl-4.0.0_pre20231218-no-pyunit.patch 689 BLAKE2B 2df3df07e290240b2e99422fda33d2ccee9f01a5f3c3aa3535e40ab66bf5de95cbef3821a3e31b0f36b82f5bc90e078e9d2f9424ea5226f7c671ce4dec571458 SHA512 9149bb90346b0c97683a4ed7056cecb727f4ff9a5b89f8b4046983475cd40937f363438129304c72199442bcc3ad948f2c86cb38b6bd0d314dba9199f34a37a6 -DIST ghdl-4.0.0.tar.gz 7683124 BLAKE2B 2b43f1a24c9fb30f754ae6326b21fd52991f3bd69fc1c2dfbd3064d950cef74f7e66f2a846778e6429fbfae07d349f913993d91c52ec53cdad894b06f810cb03 SHA512 95b08274f2ed54556fbe2e72ce52605d9ca8269b535306348d25a259615a0610b59a61fb4458e0c1e548570361af15d45d89941bf4ab4afd2fafb10b07e69cae DIST ghdl-4.1.0.tar.gz 7704716 BLAKE2B d69791d947ed11b62fac8e076c3b9e1bad606a0de57e8d5bd67c9a8f7ea0cad73643085efbaaa06fabdd5900366334b63385589da72f4db488f5b27b142a76f8 SHA512 0a3a465f7f8ed7fba9b81b5dec2903bf82731c97a127666e7644286c9ea80078354be4e6bf8947a6ef631b646dc7e8e69dce2d9a467ac36ee03c67d9335a2703 -EBUILD ghdl-4.0.0-r1.ebuild 1551 BLAKE2B 88d7bc60d054a48297b5e21d333e9479f7116c6f01cc75c239847c74c5407724ab8883edd483a36cfd4fc760a8e494e4438dc028af117a978f76b230613fa47b SHA512 a7c5bb4e4948cac92aadeff2ffd82642f34d35cfa6d63772a1ac8003238bf2ab30d9d4879c121c0d1b01e5a4f21c6e37995850bd9b36c7a6b1a1548ff6e230eb +EBUILD ghdl-4.1.0-r1.ebuild 1750 BLAKE2B 42021c87851a433f2a1fecd7da7a46a10a56dac8db0cd598c785353f8f94afe5447ffc30b49b57462bd0c1912721ee4fb6b612c284d4f95480b872e3a15f7163 SHA512 e5185ca38df8834bf34768113d2ad8b32438f98ee01e8a8acbba64b71e58dd72fbc226749badd7ef42aee98f5d84f606c371f244e179e364ebd8362292e7b91f EBUILD ghdl-4.1.0.ebuild 1551 BLAKE2B 88d7bc60d054a48297b5e21d333e9479f7116c6f01cc75c239847c74c5407724ab8883edd483a36cfd4fc760a8e494e4438dc028af117a978f76b230613fa47b SHA512 a7c5bb4e4948cac92aadeff2ffd82642f34d35cfa6d63772a1ac8003238bf2ab30d9d4879c121c0d1b01e5a4f21c6e37995850bd9b36c7a6b1a1548ff6e230eb MISC metadata.xml 1462 BLAKE2B a403ab50a3463fc26ddfb6ad65aa2cfe9782e98b74cd91fe24ef81678e7c52a2211b0bcad27accc4cd57db281ed23ad5d8697ae69dd8b67c623465949d6d3434 SHA512 4bd4c20a8fbbdaa80a63373f81bd96144e110371403832627aba81a7a95d073ee73922516a6d5c193898affbeb8bd7f1ce9fc4203faa13464cf39ba809c82d5d diff --git a/sci-electronics/ghdl/ghdl-4.0.0-r1.ebuild b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild index 7fb1396f35c1..ab07376f8f4f 100644 --- a/sci-electronics/ghdl/ghdl-4.0.0-r1.ebuild +++ b/sci-electronics/ghdl/ghdl-4.1.0-r1.ebuild @@ -4,9 +4,9 @@ EAPI=8 ADA_COMPAT=( gnat_2021 gcc_13 ) -LLVM_MAX_SLOT=17 # Check "configure" script for supported LLVM versions. +LLVM_COMPAT=( {16..17} ) # Check configure script for supported LLVM versions. -inherit ada edo llvm toolchain-funcs +inherit ada edo llvm-r1 toolchain-funcs DESCRIPTION="Open-source analyzer, compiler, and simulator for VHDL 2008/93/87" HOMEPAGE="https://ghdl.github.io/ghdl/ @@ -20,17 +20,23 @@ else SRC_URI="https://github.com/ghdl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2+" SLOT="0" -IUSE="llvm" -REQUIRED_USE="${ADA_REQUIRED_USE}" +IUSE="llvm +static-libs" + +# The LLVM backend requires static libraries to work, see bug: https://bugs.gentoo.org/938171 +REQUIRED_USE="${ADA_REQUIRED_USE} llvm? ( static-libs )" RDEPEND=" ${ADA_DEPS} - llvm? ( <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):= ) + llvm? ( + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT}= + ') + ) " DEPEND=" ${RDEPEND} @@ -44,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20231218-no-pyunit.patch" ) pkg_setup() { ada_pkg_setup - use llvm && llvm_pkg_setup + use llvm && llvm-r1_pkg_setup } src_prepare() { @@ -62,7 +68,7 @@ src_configure() { # Install location. --libdir=$(get_libdir) - --prefix=/usr + --prefix="/usr" # Features. --enable-libghdl @@ -70,7 +76,9 @@ src_configure() { ) if use llvm ; then - myconf+=( --with-llvm-config=llvm-config ) + myconf+=( + --with-llvm-config="llvm-config" + ) fi # Not a autotools script! @@ -86,5 +94,7 @@ src_compile() { src_install() { default - find "${ED}" -type f -name '*.a' -delete || die + if ! use static-libs ; then + find "${ED}" -type f -name '*.a' -delete || die + fi } |