* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/
@ 2022-09-29 23:53 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-29 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 6f5f03d793825d23190f9530d7d0359199f2cc30
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Thu Sep 29 09:46:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 23:52:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f5f03d7
dev-lang/ispc: Update live ebuild llvm patch
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/files/ispc-9999-llvm.patch | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch
index 7303ac0fd6e8..934d9eaf5a60 100644
--- a/dev-lang/ispc/files/ispc-9999-llvm.patch
+++ b/dev-lang/ispc/files/ispc-9999-llvm.patch
@@ -2,15 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13e66268..27ff8364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -218,7 +218,7 @@ if (WASM_ENABLED)
+@@ -218,10 +218,7 @@ if (WASM_ENABLED)
list(APPEND ISPC_TARGETS wasm-i32x4)
endif()
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
+set(CLANG_LIBRARY_LIST clang clang-cpp)
+-if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
+- list(APPEND CLANG_LIBRARY_LIST clangSupport)
+-endif()
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
-
- if (X86_ENABLED)
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
+ # windowsdriver is a small library introduced in LLVM 15. While it's targeted at Windows only,
@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
endif()
@@ -24,7 +27,7 @@ index 13e66268..27ff8364 100644
+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
# Link against LLVM libraries
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST} ${CMAKE_DL_LIBS})
diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
index 06fab989..57a7130f 100644
--- a/src/llvmutil.cpp
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/
@ 2022-12-24 7:18 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-24 7:18 UTC (permalink / raw
To: gentoo-commits
commit: dc09348059fd08b3857a43953bf559230dad57be
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 21 17:45:16 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:14:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc093480
dev-lang/ispc: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28735
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/files/ispc-9999-llvm.patch | 42 --------------------------------
1 file changed, 42 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch
deleted file mode 100644
index 934d9eaf5a60..000000000000
--- a/dev-lang/ispc/files/ispc-9999-llvm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e66268..27ff8364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,10 +218,7 @@ if (WASM_ENABLED)
- list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
-
--set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang clang-cpp)
--if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
-- list(APPEND CLANG_LIBRARY_LIST clangSupport)
--endif()
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
- if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "15.0.0")
- # windowsdriver is a small library introduced in LLVM 15. While it's targeted at Windows only,
-@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
- endif()
-
- # Link against Clang libraries
--foreach(clangLib ${CLANG_LIBRARY_LIST})
-- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
-- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
--endforeach()
--target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
-+find_package(Clang REQUIRED)
-+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
-
- # Link against LLVM libraries
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST} ${CMAKE_DL_LIBS})
-diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
-index 06fab989..57a7130f 100644
---- a/src/llvmutil.cpp
-+++ b/src/llvmutil.cpp
-@@ -42,6 +42,7 @@
- #include <llvm/IR/BasicBlock.h>
- #include <llvm/IR/Instructions.h>
- #include <llvm/IR/Module.h>
-+#include <llvm/Support/raw_ostream.h>
-
- #ifdef ISPC_GENX_ENABLED
- #include <llvm/GenXIntrinsics/GenXIntrinsics.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/
@ 2023-10-22 16:33 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-10-22 16:33 UTC (permalink / raw
To: gentoo-commits
commit: 69f2faa2b9b1202f91f4f7db7439321fe5e70622
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Oct 22 08:36:34 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 16:32:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f2faa2
dev-lang/ispc: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33450
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch | 16 ---------
dev-lang/ispc/files/ispc-1.18.0-llvm.patch | 39 ----------------------
2 files changed, 55 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch b/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch
deleted file mode 100644
index 127b7095a778..000000000000
--- a/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -530,11 +530,8 @@ else()
- else()
- find_package(Curses REQUIRED)
- find_package(ZLIB REQUIRED)
-- if (CURSES_EXTRA_LIBRARY)
-- # this contains the tinfo library, if found
-- target_link_libraries(${PROJECT_NAME} ${CURSES_EXTRA_LIBRARY})
-- endif()
-- target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${CURSES_CURSES_LIBRARY})
-+ set(CURSES_NEED_NCURSES ON)
-+ target_link_libraries(${PROJECT_NAME} pthread ${ZLIB_LIBRARIES} ${CURSES_LIBRARIES})
- endif()
- endif()
-
diff --git a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
deleted file mode 100644
index 7303ac0fd6e8..000000000000
--- a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e66268..27ff8364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,7 +218,7 @@ if (WASM_ENABLED)
- list(APPEND ISPC_TARGETS wasm-i32x4)
- endif()
-
--set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
-+set(CLANG_LIBRARY_LIST clang clang-cpp)
- set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option frontendopenmp)
-
- if (X86_ENABLED)
-@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
- endif()
-
- # Link against Clang libraries
--foreach(clangLib ${CLANG_LIBRARY_LIST})
-- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
-- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
--endforeach()
--target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
-+find_package(Clang REQUIRED)
-+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
-
- # Link against LLVM libraries
- target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
-diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
-index 06fab989..57a7130f 100644
---- a/src/llvmutil.cpp
-+++ b/src/llvmutil.cpp
-@@ -42,6 +42,7 @@
- #include <llvm/IR/BasicBlock.h>
- #include <llvm/IR/Instructions.h>
- #include <llvm/IR/Module.h>
-+#include <llvm/Support/raw_ostream.h>
-
- #ifdef ISPC_GENX_ENABLED
- #include <llvm/GenXIntrinsics/GenXIntrinsics.h>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-22 16:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-29 23:53 [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-24 7:18 Sam James
2023-10-22 16:33 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox