mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-09 15:13:31 -04:00
sci-electronics/slang: drop 1.0, 2.0-r2, 3.0
Signed-off-by: Steffen Winter <steffen.winter@proton.me>
This commit is contained in:
Steffen Winter
@@ -1,5 +1,2 @@
|
||||
DIST slang-1.0.tar.gz 1239664 BLAKE2B 98355987b5c355eb914dd0d38c7441d5d39b7a0259e557d9cfd6271fd35aab642db6036d55228f75522fef0c31a4c82dea4d09cdb04ea33c60d843a3ca14caf0 SHA512 25ef7f5abb1b73928f61b853db5462baf72077a47daa9419311aba1f8fdca0bd499518c2f64dfff95b3c0671e52f2b1cd37edb7d1c74fb983b74de08fe7eea37
|
||||
DIST slang-2.0.tar.gz 1026299 BLAKE2B d55e0f419e030a37ff80aef3c0b16a96ee402707c758797fea3d1914e29247d22d240693cd873f95f634438fad5b8ed65961a324c69788fc3e62f83ce0a94869 SHA512 3d18961cda7eb40877932e937364b19cfcef3127a8467fbfc70febd1d6ef8b267aeae8244355a4b0206197ef126ee5a65aa4a4fb49d0970fe6c626725b7e6b21
|
||||
DIST slang-3.0.tar.gz 1097223 BLAKE2B 87f7ac55fb719e64049e56792af9edbe20c39cebcd496f3fa3c980f54490a885f8bc3443b0c841930baf1d57854aba54747acf3f6a8debda3e1cb110dae364f0 SHA512 3d340ccdd7573d61b9e391861712d6b97a2c686b2bae351c1b25f11539146f6d00539b044c69f7dc362ed160828a1bb00f180553dcb760affe912e521bc56a8a
|
||||
DIST slang-4.0.tar.gz 1308308 BLAKE2B 99029a26b3fe86942abc33381f8f9ba050c09b390ed7fc54404f4054eb34a83e168d53096cad2e8f037954770a95009c701c86b1e59e1e9d02e1709fd120164c SHA512 043c053452b2d452875b2e3ed96be5b96275544e2a692bec8b170e01cefec6e5648a6681e3cac3afd2a68c8ec57f6461a9a73394d74abbc8627d49b66978808e
|
||||
DIST slang-5.0.tar.gz 1334032 BLAKE2B 08981f86d0be6a4a7d391a2b65d8f4e5bdab8e3ba50f6e847e2b25fec9d9345e806045faae3c74fd71db90f939d8668ff775465ea1e8433d660a0a53f20a358a SHA512 a1b7b9aac7357a9a7cc1818adbb5e9622234f607aba452ca57e3d28b31779339bb19557137cf37cdcc2abb2aba15eb6d2f580169322caf075a2518b3d8634a26
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From b821c33c391814ac332d6a85783179e084d1345a Mon Sep 17 00:00:00 2001
|
||||
From: Nick Gasson <nick@nickg.me.uk>
|
||||
Date: Sun, 20 Nov 2022 21:23:24 +0000
|
||||
Subject: [PATCH] Fix library name in sv-lang.pc.in (#661)
|
||||
|
||||
---
|
||||
scripts/sv-lang.pc.in | 4 +-
|
||||
1 file changed, 2 insertion(+), 2 deletion(-)
|
||||
|
||||
diff --git a/scripts/sv-lang.pc.in b/scripts/sv-lang.pc.in
|
||||
index eabfbc9a..fc6191b7 100644
|
||||
--- a/scripts/sv-lang.pc.in
|
||||
+++ b/scripts/sv-lang.pc.in
|
||||
@@ -2,9 +2,9 @@
|
||||
includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
|
||||
|
||||
-Name: @PROJECT_NAME@
|
||||
+Name: svlang
|
||||
Description: @PROJECT_DESCRIPTION@
|
||||
URL: @PROJECT_HOMEPAGE_URL@
|
||||
Version: @PROJECT_VERSION@
|
||||
Cflags: -I"${includedir}"
|
||||
-Libs: -L"${libdir}" -lslang
|
||||
+Libs: -L"${libdir}" -lsvlang
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From 16ef772ec581e929197eae35ef99993e4d7c8dbb Mon Sep 17 00:00:00 2001
|
||||
From: Huang Rui <vowstar@gmail.com>
|
||||
Date: Thu, 3 Nov 2022 12:04:42 +0800
|
||||
Subject: [PATCH] external/CMakeLists.txt: fix find_pkg when unordered_dense
|
||||
installed
|
||||
|
||||
If the user has already installed unordered_dense beforehand,
|
||||
avoid downloading and installing again.
|
||||
Applicable when the distribution has packaged unordered_dense.
|
||||
|
||||
Signed-off-by: Huang Rui <vowstar@gmail.com>
|
||||
---
|
||||
external/CMakeLists.txt | 22 ++++++++++++++++------
|
||||
1 file changed, 16 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||
index 97e0e79c7..6eb30989a 100644
|
||||
--- a/external/CMakeLists.txt
|
||||
+++ b/external/CMakeLists.txt
|
||||
@@ -27,11 +27,17 @@ if((SLANG_INCLUDE_PYLIB OR BUILD_SHARED_LIBS) AND NOT fmt_FOUND)
|
||||
set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
|
||||
+set(find_pkg_args "")
|
||||
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
|
||||
+ set(find_pkg_args "FIND_PACKAGE_ARGS" "2.0.0")
|
||||
+endif()
|
||||
+
|
||||
FetchContent_Declare(
|
||||
unordered_dense
|
||||
GIT_REPOSITORY https://github.com/martinus/unordered_dense.git
|
||||
GIT_TAG v2.0.0
|
||||
- GIT_SHALLOW ON)
|
||||
+ GIT_SHALLOW ON
|
||||
+ ${find_pkg_args})
|
||||
FetchContent_MakeAvailable(unordered_dense)
|
||||
|
||||
if(SLANG_INCLUDE_INSTALL)
|
||||
@@ -44,10 +50,12 @@ if(SLANG_INCLUDE_INSTALL)
|
||||
${PROJECT_SOURCE_DIR}/external/span.hpp
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
COMPONENT slang_Development)
|
||||
- install(
|
||||
- DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl
|
||||
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
- COMPONENT slang_Development)
|
||||
+ if(NOT unordered_dense_FOUND)
|
||||
+ install(
|
||||
+ DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
+ COMPONENT slang_Development)
|
||||
+ endif()
|
||||
|
||||
if(NOT fmt_FOUND)
|
||||
install(
|
||||
@@ -59,5 +67,7 @@ if(SLANG_INCLUDE_INSTALL)
|
||||
PRIVATE_HEADER EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
- install(TARGETS unordered_dense EXPORT slangTargets)
|
||||
+ if(NOT unordered_dense_FOUND)
|
||||
+ install(TARGETS unordered_dense EXPORT slangTargets)
|
||||
+ endif()
|
||||
endif()
|
||||
@@ -1,32 +0,0 @@
|
||||
From a3bf429c886407198e7e3a292af80e6c60ee27d2 Mon Sep 17 00:00:00 2001
|
||||
From: jrudess <jordan.r.rudess@gmail.com>
|
||||
Date: Sat, 5 Nov 2022 16:24:04 -0700
|
||||
Subject: [PATCH] Provide cmake override for shared-lib name
|
||||
|
||||
---
|
||||
source/CMakeLists.txt | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
index 58b73678..f9ac7cd4 100644
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -86,6 +86,7 @@ add_library(
|
||||
|
||||
add_subdirectory(ast)
|
||||
|
||||
+set(SLANG_SHARED_LIB_NAME svlang)
|
||||
add_library(slang::slang ALIAS slang_slang)
|
||||
set_target_properties(
|
||||
slang_slang
|
||||
@@ -93,8 +94,8 @@ set_target_properties(
|
||||
VISIBILITY_INLINES_HIDDEN YES
|
||||
VERSION ${PROJECT_VERSION}
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
- EXPORT_NAME slang
|
||||
- OUTPUT_NAME slang)
|
||||
+ EXPORT_NAME ${SLANG_SHARED_LIB_NAME}
|
||||
+ OUTPUT_NAME ${SLANG_SHARED_LIB_NAME})
|
||||
|
||||
# Compile options
|
||||
target_compile_options(slang_slang PRIVATE ${SLANG_WARN_FLAGS})
|
||||
@@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
DESCRIPTION="SystemVerilog compiler and language services"
|
||||
HOMEPAGE="
|
||||
https://sv-lang.com
|
||||
https://github.com/MikePopoloski/slang
|
||||
"
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
S="${WORKDIR}/${P}"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="python test"
|
||||
REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
dev-libs/libfmt
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
python_setup
|
||||
|
||||
local mycmakeargs=(
|
||||
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
|
||||
-D BUILD_SHARED_LIBS=ON
|
||||
-D SLANG_INCLUDE_TESTS=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
# fix libdir path
|
||||
if [[ "$(get_libdir)" != "lib" ]] ; then
|
||||
mv "${D}"/usr/lib "${D}"/usr/"$(get_libdir)" || die
|
||||
fi
|
||||
# file collisions of internal fmt
|
||||
rm -r "${D}"/usr/include/fmt || die
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
DESCRIPTION="SystemVerilog compiler and language services"
|
||||
HOMEPAGE="
|
||||
https://sv-lang.com
|
||||
https://github.com/MikePopoloski/slang
|
||||
"
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
S="${WORKDIR}/${P}"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="python test"
|
||||
REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=dev-cpp/catch-3.0.1
|
||||
>=dev-libs/libfmt-9.1.0
|
||||
>=dev-libs/unordered_dense-2.0.0 <dev-libs/unordered_dense-2.0.1
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch"
|
||||
"${FILESDIR}/${PN}-2.0-renamed-svlang.patch"
|
||||
"${FILESDIR}/${PN}-2.0-fix-pkgconfig.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
python_setup
|
||||
# SLANG_SHARED_LIB_NAME=svlang because of name collision
|
||||
# https://github.com/MikePopoloski/slang/issues/646
|
||||
local mycmakeargs=(
|
||||
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
|
||||
-D BUILD_SHARED_LIBS=ON
|
||||
-D SLANG_INCLUDE_PYLIB=$(usex python)
|
||||
-D SLANG_INCLUDE_TESTS=$(usex test)
|
||||
-D SLANG_SHARED_LIB_NAME="svlang"
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use python; then
|
||||
# fix python unexpected paths QA
|
||||
mkdir -p "${D}/$(python_get_sitedir)" || die
|
||||
mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die
|
||||
fi
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
DESCRIPTION="SystemVerilog compiler and language services"
|
||||
HOMEPAGE="
|
||||
https://sv-lang.com
|
||||
https://github.com/MikePopoloski/slang
|
||||
"
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
S="${WORKDIR}/${P}"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="python test"
|
||||
REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
>=dev-cpp/catch-3.0.1
|
||||
>=dev-libs/libfmt-9.1.0
|
||||
>=dev-libs/unordered_dense-2.0.1 <dev-libs/unordered_dense-2.0.2
|
||||
$(python_gen_cond_dep '
|
||||
>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
|
||||
')
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
python_setup
|
||||
local mycmakeargs=(
|
||||
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
|
||||
-D BUILD_SHARED_LIBS=ON
|
||||
-D SLANG_USE_BOOST=OFF
|
||||
-D SLANG_INCLUDE_PYLIB=$(usex python)
|
||||
-D SLANG_INCLUDE_TESTS=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use python; then
|
||||
# fix python unexpected paths QA
|
||||
mkdir -p "${D}/$(python_get_sitedir)" || die
|
||||
mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user