| 1 |
commit: f1e1607db814cc9869b457ffe7394d7c96f34fa8 |
| 2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Nov 7 02:47:14 2022 +0000 |
| 4 |
Commit: Rui Huang <vowstar <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Nov 7 02:47:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1e1607d |
| 7 |
|
| 8 |
sci-electronics/slang: rename libslang to libsvlang |
| 9 |
|
| 10 |
Issue: https://github.com/MikePopoloski/slang/issues/646 |
| 11 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
| 12 |
|
| 13 |
...h.patch => slang-2.0-fix-unordered-dense.patch} | 0 |
| 14 |
.../slang/files/slang-2.0-renamed-svlang.patch | 32 ++++++++++++++++++++++ |
| 15 |
sci-electronics/slang/slang-2.0.ebuild | 8 ++++-- |
| 16 |
sci-electronics/slang/slang-9999.ebuild | 8 ++++-- |
| 17 |
4 files changed, 42 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
similarity index 100% |
| 21 |
rename from sci-electronics/slang/files/slang-2.0-fix-lib-path.patch |
| 22 |
rename to sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch |
| 23 |
|
| 24 |
diff --git a/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch |
| 25 |
new file mode 100644 |
| 26 |
index 000000000..107b69d36 |
| 27 |
--- /dev/null |
| 28 |
+++ b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch |
| 29 |
@@ -0,0 +1,32 @@ |
| 30 |
+From a3bf429c886407198e7e3a292af80e6c60ee27d2 Mon Sep 17 00:00:00 2001 |
| 31 |
+From: jrudess <jordan.r.rudess@×××××.com> |
| 32 |
+Date: Sat, 5 Nov 2022 16:24:04 -0700 |
| 33 |
+Subject: [PATCH] Provide cmake override for shared-lib name |
| 34 |
+ |
| 35 |
+--- |
| 36 |
+ source/CMakeLists.txt | 5 +++-- |
| 37 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
| 38 |
+ |
| 39 |
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt |
| 40 |
+index 58b73678..f9ac7cd4 100644 |
| 41 |
+--- a/source/CMakeLists.txt |
| 42 |
++++ b/source/CMakeLists.txt |
| 43 |
+@@ -86,6 +86,7 @@ add_library( |
| 44 |
+ |
| 45 |
+ add_subdirectory(ast) |
| 46 |
+ |
| 47 |
++set(SLANG_SHARED_LIB_NAME slang) |
| 48 |
+ add_library(slang::slang ALIAS slang_slang) |
| 49 |
+ set_target_properties( |
| 50 |
+ slang_slang |
| 51 |
+@@ -93,8 +94,8 @@ set_target_properties( |
| 52 |
+ VISIBILITY_INLINES_HIDDEN YES |
| 53 |
+ VERSION ${PROJECT_VERSION} |
| 54 |
+ SOVERSION ${PROJECT_VERSION_MAJOR} |
| 55 |
+- EXPORT_NAME slang |
| 56 |
+- OUTPUT_NAME slang) |
| 57 |
++ EXPORT_NAME ${SLANG_SHARED_LIB_NAME} |
| 58 |
++ OUTPUT_NAME ${SLANG_SHARED_LIB_NAME}) |
| 59 |
+ |
| 60 |
+ # Compile options |
| 61 |
+ target_compile_options(slang_slang PRIVATE ${SLANG_WARN_FLAGS}) |
| 62 |
|
| 63 |
diff --git a/sci-electronics/slang/slang-2.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild |
| 64 |
index ed4201ed5..21f8cc2ac 100644 |
| 65 |
--- a/sci-electronics/slang/slang-2.0.ebuild |
| 66 |
+++ b/sci-electronics/slang/slang-2.0.ebuild |
| 67 |
@@ -42,18 +42,20 @@ DEPEND=" |
| 68 |
" |
| 69 |
|
| 70 |
PATCHES=( |
| 71 |
- "${FILESDIR}/${PN}-2.0-fix-lib-path.patch" |
| 72 |
+ "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" |
| 73 |
+ "${FILESDIR}/${PN}-2.0-renamed-svlang.patch" |
| 74 |
) |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
python_setup |
| 78 |
- # BUILD_SHARED_LIBS=OFF because of name collision |
| 79 |
+ # SLANG_SHARED_LIB_NAME=svlang because of name collision |
| 80 |
# https://github.com/MikePopoloski/slang/issues/646 |
| 81 |
local mycmakeargs=( |
| 82 |
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
| 83 |
- -D BUILD_SHARED_LIBS=OFF |
| 84 |
+ -D BUILD_SHARED_LIBS=ON |
| 85 |
-D SLANG_INCLUDE_PYLIB=$(usex python) |
| 86 |
-D SLANG_INCLUDE_TESTS=$(usex test) |
| 87 |
+ -D SLANG_SHARED_LIB_NAME="svlang" |
| 88 |
) |
| 89 |
cmake_src_configure |
| 90 |
} |
| 91 |
|
| 92 |
diff --git a/sci-electronics/slang/slang-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild |
| 93 |
index ed4201ed5..21f8cc2ac 100644 |
| 94 |
--- a/sci-electronics/slang/slang-9999.ebuild |
| 95 |
+++ b/sci-electronics/slang/slang-9999.ebuild |
| 96 |
@@ -42,18 +42,20 @@ DEPEND=" |
| 97 |
" |
| 98 |
|
| 99 |
PATCHES=( |
| 100 |
- "${FILESDIR}/${PN}-2.0-fix-lib-path.patch" |
| 101 |
+ "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" |
| 102 |
+ "${FILESDIR}/${PN}-2.0-renamed-svlang.patch" |
| 103 |
) |
| 104 |
|
| 105 |
src_configure() { |
| 106 |
python_setup |
| 107 |
- # BUILD_SHARED_LIBS=OFF because of name collision |
| 108 |
+ # SLANG_SHARED_LIB_NAME=svlang because of name collision |
| 109 |
# https://github.com/MikePopoloski/slang/issues/646 |
| 110 |
local mycmakeargs=( |
| 111 |
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
| 112 |
- -D BUILD_SHARED_LIBS=OFF |
| 113 |
+ -D BUILD_SHARED_LIBS=ON |
| 114 |
-D SLANG_INCLUDE_PYLIB=$(usex python) |
| 115 |
-D SLANG_INCLUDE_TESTS=$(usex test) |
| 116 |
+ -D SLANG_SHARED_LIB_NAME="svlang" |
| 117 |
) |
| 118 |
cmake_src_configure |
| 119 |
} |
Archives