aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Rui <vowstar@gmail.com>2022-11-07 10:47:14 +0800
committerHuang Rui <vowstar@gmail.com>2022-11-07 10:47:14 +0800
commitf1e1607db814cc9869b457ffe7394d7c96f34fa8 (patch)
treef00c3d399f5d4460196f104d05ad9aa9f5b85871 /sci-electronics
parentnet-dialup/tio: drop 2.2 (diff)
downloadguru-f1e1607db814cc9869b457ffe7394d7c96f34fa8.tar.gz
guru-f1e1607db814cc9869b457ffe7394d7c96f34fa8.tar.bz2
guru-f1e1607db814cc9869b457ffe7394d7c96f34fa8.zip
sci-electronics/slang: rename libslang to libsvlang
Issue: https://github.com/MikePopoloski/slang/issues/646 Signed-off-by: Huang Rui <vowstar@gmail.com>
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch (renamed from sci-electronics/slang/files/slang-2.0-fix-lib-path.patch)0
-rw-r--r--sci-electronics/slang/files/slang-2.0-renamed-svlang.patch32
-rw-r--r--sci-electronics/slang/slang-2.0.ebuild8
-rw-r--r--sci-electronics/slang/slang-9999.ebuild8
4 files changed, 42 insertions, 6 deletions
diff --git a/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch b/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch
index 8aeb228fa..8aeb228fa 100644
--- a/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch
+++ b/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch
diff --git a/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch
new file mode 100644
index 000000000..107b69d36
--- /dev/null
+++ b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch
@@ -0,0 +1,32 @@
+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 slang)
+ 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})
diff --git a/sci-electronics/slang/slang-2.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild
index ed4201ed5..21f8cc2ac 100644
--- a/sci-electronics/slang/slang-2.0.ebuild
+++ b/sci-electronics/slang/slang-2.0.ebuild
@@ -42,18 +42,20 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+ "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch"
+ "${FILESDIR}/${PN}-2.0-renamed-svlang.patch"
)
src_configure() {
python_setup
- # BUILD_SHARED_LIBS=OFF because of name collision
+ # 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=OFF
+ -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
}
diff --git a/sci-electronics/slang/slang-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild
index ed4201ed5..21f8cc2ac 100644
--- a/sci-electronics/slang/slang-9999.ebuild
+++ b/sci-electronics/slang/slang-9999.ebuild
@@ -42,18 +42,20 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+ "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch"
+ "${FILESDIR}/${PN}-2.0-renamed-svlang.patch"
)
src_configure() {
python_setup
- # BUILD_SHARED_LIBS=OFF because of name collision
+ # 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=OFF
+ -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
}