* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2020-06-28 16:45 Christoph Junghans
0 siblings, 0 replies; 8+ messages in thread
From: Christoph Junghans @ 2020-06-28 16:45 UTC (permalink / raw
To: gentoo-commits
commit: f073ca910b7838d71043c2ae752fcd0d147937bd
Author: Guillaume BRUN <the.cheaterman <AT> gmail <DOT> com>
AuthorDate: Sun Jun 28 15:48:55 2020 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:43:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f073ca91
dev-lang/ispc: Add -1.13.0 ebuild
Closes: https://bugs.gentoo.org/656632
Closes: https://bugs.gentoo.org/729924
Signed-off-by: Guillaume BRUN <the.cheaterman <AT> gmail.com>
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
dev-lang/ispc/Manifest | 1 +
.../files/ispc-1.13.0-cmake-gentoo-release.patch | 13 +++
dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch | 106 +++++++++++++++++++++
dev-lang/ispc/files/ispc-1.13.0-werror.patch | 13 +++
.../ispc/{ispc-9999.ebuild => ispc-1.13.0.ebuild} | 27 ++++--
5 files changed, 150 insertions(+), 10 deletions(-)
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 20f32b7fe6c..09380cb968c 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1 +1,2 @@
+DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
diff --git a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
new file mode 100644
index 00000000000..b89e6150400
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+
+ if(CMAKE_BUILD_TYPE)
+ # Validate build type
+- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
+
+ string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+ if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
new file mode 100644
index 00000000000..6911a76d9e1
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
@@ -0,0 +1,106 @@
+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)
+
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
+@@ -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>
+ #include <map>
+ #include <set>
+ #include <vector>
+@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
+ return;
+
+ fprintf(stderr, " ");
+- v->dump();
++ v->print(llvm::outs(), false);
+ done.insert(v);
+
+ if (inst == NULL)
+diff --git a/src/opt.cpp b/src/opt.cpp
+index d78ac374..a607594a 100644
+--- a/src/opt.cpp
++++ b/src/opt.cpp
+@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+ getenv("FUNC"), strlen(getenv("FUNC")))))) { \
+ fprintf(stderr, "Start of " NAME "\n"); \
+ fprintf(stderr, "---------------\n"); \
+- bb.dump(); \
++ bb.print(llvm::outs(), false); \
+ fprintf(stderr, "---------------\n\n"); \
+ } else /* eat semicolon */
+
+@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+ getenv("FUNC"), strlen(getenv("FUNC")))))) { \
+ fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
+ fprintf(stderr, "---------------\n"); \
+- bb.dump(); \
++ bb.print(llvm::outs(), false); \
+ fprintf(stderr, "---------------\n\n"); \
+ } else /* eat semicolon */
+ #else
+@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+ if (g->debugPrint) {
+ printf("*** Code going into optimization ***\n");
+- module->dump();
++ module->print(llvm::outs(), nullptr);
+ }
+ #endif
+ DebugPassManager optPM;
+@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+ if (g->debugPrint) {
+ printf("\n*****\nFINAL OUTPUT\n*****\n");
+- module->dump();
++ module->print(llvm::outs(), nullptr);
+ }
+ #endif
+ }
+@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
+ bool DebugPass::runOnModule(llvm::Module &module) {
+ fprintf(stderr, "%s", str_output);
+ fflush(stderr);
+- module.dump();
++ module.print(llvm::outs(), nullptr);
+ return true;
+ }
+
+@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
+ snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
+ llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
+ Assert(!EC && "IR dump file creation failed!");
+- module.print(OS, 0);
++ module.print(OS, nullptr);
+ }
+
+ bool DebugPassFile::runOnModule(llvm::Module &module) {
diff --git a/dev-lang/ispc/files/ispc-1.13.0-werror.patch b/dev-lang/ispc/files/ispc-1.13.0-werror.patch
new file mode 100644
index 00000000000..3fa144b78db
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+ # Compile options
+ if (UNIX)
+- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
+ # Security options
+ target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
+ -Wformat -Wformat-security -fpie -fwrapv)
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-1.13.0.ebuild
similarity index 65%
rename from dev-lang/ispc/ispc-9999.ebuild
rename to dev-lang/ispc/ispc-1.13.0.ebuild
index d1c2c233112..244bb728565 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-1.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs python-any-r1
+inherit cmake toolchain-funcs python-any-r1
DESCRIPTION="Intel SPMD Program Compiler"
HOMEPAGE="https://ispc.github.com/"
@@ -34,19 +34,26 @@ DEPEND="
sys-devel/flex
"
-src_compile() {
- #make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
- sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
- emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
+PATCHES=(
+ "${FILESDIR}/${P}-cmake-gentoo-release.patch"
+ "${FILESDIR}/${P}-llvm-10.patch"
+ "${FILESDIR}/${P}-werror.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ "-DARM_ENABLED=$(usex arm)"
+ )
+ cmake_src_configure
}
src_install() {
- dobin ispc
- dodoc README.rst
+ dobin ${BUILD_DIR}/bin/ispc
+ dodoc README.md
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
docompress -x "/usr/share/doc/${PF}/examples"
- doins -r examples/*
+ doins -r ${BUILD_DIR}/examples/*
fi
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2020-06-28 16:45 Christoph Junghans
0 siblings, 0 replies; 8+ messages in thread
From: Christoph Junghans @ 2020-06-28 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 526716bac86709f53cab67e71ab2d899cdcd2269
Author: Guillaume BRUN <the.cheaterman <AT> gmail <DOT> com>
AuthorDate: Sun Jun 28 15:56:26 2020 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sun Jun 28 16:44:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526716ba
dev-lang/ispc: Add -9999 ebuild
Signed-off-by: Guillaume BRUN <the.cheaterman <AT> gmail.com>
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
.../files/ispc-9999-cmake-gentoo-release.patch | 13 +++
dev-lang/ispc/files/ispc-9999-llvm-10.patch | 106 +++++++++++++++++++++
dev-lang/ispc/files/ispc-9999-werror.patch | 13 +++
dev-lang/ispc/ispc-9999.ebuild | 59 ++++++++++++
dev-lang/ispc/metadata.xml | 5 +-
5 files changed, 192 insertions(+), 4 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
new file mode 100644
index 00000000000..b89e6150400
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+
+ if(CMAKE_BUILD_TYPE)
+ # Validate build type
+- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
+
+ string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+ if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm-10.patch b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
new file mode 100644
index 00000000000..6911a76d9e1
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
@@ -0,0 +1,106 @@
+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)
+
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
+@@ -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>
+ #include <map>
+ #include <set>
+ #include <vector>
+@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
+ return;
+
+ fprintf(stderr, " ");
+- v->dump();
++ v->print(llvm::outs(), false);
+ done.insert(v);
+
+ if (inst == NULL)
+diff --git a/src/opt.cpp b/src/opt.cpp
+index d78ac374..a607594a 100644
+--- a/src/opt.cpp
++++ b/src/opt.cpp
+@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+ getenv("FUNC"), strlen(getenv("FUNC")))))) { \
+ fprintf(stderr, "Start of " NAME "\n"); \
+ fprintf(stderr, "---------------\n"); \
+- bb.dump(); \
++ bb.print(llvm::outs(), false); \
+ fprintf(stderr, "---------------\n\n"); \
+ } else /* eat semicolon */
+
+@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
+ getenv("FUNC"), strlen(getenv("FUNC")))))) { \
+ fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
+ fprintf(stderr, "---------------\n"); \
+- bb.dump(); \
++ bb.print(llvm::outs(), false); \
+ fprintf(stderr, "---------------\n\n"); \
+ } else /* eat semicolon */
+ #else
+@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+ if (g->debugPrint) {
+ printf("*** Code going into optimization ***\n");
+- module->dump();
++ module->print(llvm::outs(), nullptr);
+ }
+ #endif
+ DebugPassManager optPM;
+@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
+ #ifndef ISPC_NO_DUMPS
+ if (g->debugPrint) {
+ printf("\n*****\nFINAL OUTPUT\n*****\n");
+- module->dump();
++ module->print(llvm::outs(), nullptr);
+ }
+ #endif
+ }
+@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
+ bool DebugPass::runOnModule(llvm::Module &module) {
+ fprintf(stderr, "%s", str_output);
+ fflush(stderr);
+- module.dump();
++ module.print(llvm::outs(), nullptr);
+ return true;
+ }
+
+@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
+ snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
+ llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
+ Assert(!EC && "IR dump file creation failed!");
+- module.print(OS, 0);
++ module.print(OS, nullptr);
+ }
+
+ bool DebugPassFile::runOnModule(llvm::Module &module) {
diff --git a/dev-lang/ispc/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch
new file mode 100644
index 00000000000..3fa144b78db
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
+ ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
+ # Compile options
+ if (UNIX)
+- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
+ # Security options
+ target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
+ -Wformat -Wformat-security -fpie -fwrapv)
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
new file mode 100644
index 00000000000..244bb728565
--- /dev/null
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake toolchain-funcs python-any-r1
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.com/"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ispc/ispc.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+ >=sys-devel/clang-3.0:*
+ >=sys-devel/llvm-3.0:*
+ "
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ sys-devel/bison
+ sys-devel/flex
+ "
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake-gentoo-release.patch"
+ "${FILESDIR}/${P}-llvm-10.patch"
+ "${FILESDIR}/${P}-werror.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ "-DARM_ENABLED=$(usex arm)"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ dobin ${BUILD_DIR}/bin/ispc
+ dodoc README.md
+
+ if use examples; then
+ insinto "/usr/share/doc/${PF}/examples"
+ docompress -x "/usr/share/doc/${PF}/examples"
+ doins -r ${BUILD_DIR}/examples/*
+ fi
+}
diff --git a/dev-lang/ispc/metadata.xml b/dev-lang/ispc/metadata.xml
index c214c07655f..285bd7dd705 100644
--- a/dev-lang/ispc/metadata.xml
+++ b/dev-lang/ispc/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>junghans@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">ispc/ispc</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2020-07-29 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-07-29 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 36d443c5e4f5e8a370b30b81107dc806b13eeec7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 16:50:02 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 16:52:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d443c5
dev-lang/ispc: Remove 1.9.2, [QA] drop utterly duplicate patches
Closes: https://bugs.gentoo.org/670628
Closes: https://bugs.gentoo.org/667624
Closes: https://bugs.gentoo.org/652442
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-lang/ispc/Manifest | 1 -
.../files/ispc-9999-cmake-gentoo-release.patch | 13 ---
dev-lang/ispc/files/ispc-9999-llvm-10.patch | 106 ---------------------
dev-lang/ispc/files/ispc-9999-werror.patch | 13 ---
dev-lang/ispc/ispc-1.9.2.ebuild | 52 ----------
dev-lang/ispc/ispc-9999.ebuild | 6 +-
6 files changed, 3 insertions(+), 188 deletions(-)
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 09380cb968c..b1de2c9d7ee 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,2 +1 @@
DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
-DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
diff --git a/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
deleted file mode 100644
index b89e6150400..00000000000
--- a/dev-lang/ispc/files/ispc-9999-cmake-gentoo-release.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e66268..27ff8364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
-
- if(CMAKE_BUILD_TYPE)
- # Validate build type
-- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
-+ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
-
- string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
- if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm-10.patch b/dev-lang/ispc/files/ispc-9999-llvm-10.patch
deleted file mode 100644
index 6911a76d9e1..00000000000
--- a/dev-lang/ispc/files/ispc-9999-llvm-10.patch
+++ /dev/null
@@ -1,106 +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)
-
- if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
-@@ -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>
- #include <map>
- #include <set>
- #include <vector>
-@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
- return;
-
- fprintf(stderr, " ");
-- v->dump();
-+ v->print(llvm::outs(), false);
- done.insert(v);
-
- if (inst == NULL)
-diff --git a/src/opt.cpp b/src/opt.cpp
-index d78ac374..a607594a 100644
---- a/src/opt.cpp
-+++ b/src/opt.cpp
-@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
- getenv("FUNC"), strlen(getenv("FUNC")))))) { \
- fprintf(stderr, "Start of " NAME "\n"); \
- fprintf(stderr, "---------------\n"); \
-- bb.dump(); \
-+ bb.print(llvm::outs(), false); \
- fprintf(stderr, "---------------\n\n"); \
- } else /* eat semicolon */
-
-@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
- getenv("FUNC"), strlen(getenv("FUNC")))))) { \
- fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
- fprintf(stderr, "---------------\n"); \
-- bb.dump(); \
-+ bb.print(llvm::outs(), false); \
- fprintf(stderr, "---------------\n\n"); \
- } else /* eat semicolon */
- #else
-@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
- #ifndef ISPC_NO_DUMPS
- if (g->debugPrint) {
- printf("*** Code going into optimization ***\n");
-- module->dump();
-+ module->print(llvm::outs(), nullptr);
- }
- #endif
- DebugPassManager optPM;
-@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
- #ifndef ISPC_NO_DUMPS
- if (g->debugPrint) {
- printf("\n*****\nFINAL OUTPUT\n*****\n");
-- module->dump();
-+ module->print(llvm::outs(), nullptr);
- }
- #endif
- }
-@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
- bool DebugPass::runOnModule(llvm::Module &module) {
- fprintf(stderr, "%s", str_output);
- fflush(stderr);
-- module.dump();
-+ module.print(llvm::outs(), nullptr);
- return true;
- }
-
-@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
- snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
- llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
- Assert(!EC && "IR dump file creation failed!");
-- module.print(OS, 0);
-+ module.print(OS, nullptr);
- }
-
- bool DebugPassFile::runOnModule(llvm::Module &module) {
diff --git a/dev-lang/ispc/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch
deleted file mode 100644
index 3fa144b78db..00000000000
--- a/dev-lang/ispc/files/ispc-9999-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e66268..27ff8364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
- ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
- # Compile options
- if (UNIX)
-- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
-+ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
- # Security options
- target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
- -Wformat -Wformat-security -fpie -fwrapv)
diff --git a/dev-lang/ispc/ispc-1.9.2.ebuild b/dev-lang/ispc/ispc-1.9.2.ebuild
deleted file mode 100644
index d1c2c233112..00000000000
--- a/dev-lang/ispc/ispc-1.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ispc/ispc.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
- >=sys-devel/clang-3.0:*
- >=sys-devel/llvm-3.0:*
- "
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
- sys-devel/bison
- sys-devel/flex
- "
-
-src_compile() {
- #make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
- sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
- emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
-}
-
-src_install() {
- dobin ispc
- dodoc README.rst
-
- if use examples; then
- insinto "/usr/share/doc/${PF}/examples"
- docompress -x "/usr/share/doc/${PF}/examples"
- doins -r examples/*
- fi
-}
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index 244bb728565..d2a75a6652a 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -35,9 +35,9 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-cmake-gentoo-release.patch"
- "${FILESDIR}/${P}-llvm-10.patch"
- "${FILESDIR}/${P}-werror.patch"
+ "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
+ "${FILESDIR}/${PN}-1.13.0-llvm-10.patch"
+ "${FILESDIR}/${PN}-1.13.0-werror.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2021-05-26 5:21 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-05-26 5:21 UTC (permalink / raw
To: gentoo-commits
commit: b26f9d3cc957269fcaad9d44148fa225420eb5e5
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Wed Apr 21 14:02:00 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 26 05:21:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26f9d3c
dev-lang/ispc: Update live ebuild
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20498
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-lang/ispc/files/ispc-9999-llvm.patch | 39 ++++++++++++++++++++++++++++++
dev-lang/ispc/files/ispc-9999-werror.patch | 13 ++++++++++
dev-lang/ispc/ispc-9999.ebuild | 19 +++++++++------
3 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-9999-llvm.patch b/dev-lang/ispc/files/ispc-9999-llvm.patch
new file mode 100644
index 00000000000..7303ac0fd6e
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-llvm.patch
@@ -0,0 +1,39 @@
+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>
diff --git a/dev-lang/ispc/files/ispc-9999-werror.patch b/dev-lang/ispc/files/ispc-9999-werror.patch
new file mode 100644
index 00000000000..0e860a95de2
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-9999-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
+ set_source_files_properties(${FLEX_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4003")
+ set_source_files_properties(${BISON_OUTPUT} PROPERTIES COMPILE_FLAGS "/wd4005 /wd4065")
+ else()
+- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
++ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
+ # The change implementing -Wno-unused-but-set-variable in clang was reverted, so commenting out for now.
+ #if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "13.0.0")
+ # set_source_files_properties(${BISON_CPP_OUTPUT} PROPERTIES COMPILE_FLAGS "-Wno-unused-but-set-variable")
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index aeb4e572cb4..23b20156fd2 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -7,10 +7,10 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit cmake toolchain-funcs python-any-r1 llvm
-LLVM_MAX_SLOT=10
+LLVM_MAX_SLOT=12
DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="https://ispc.github.com/"
+HOMEPAGE="https://ispc.github.io/"
if [[ ${PV} = *9999 ]]; then
inherit git-r3
@@ -24,7 +24,7 @@ LICENSE="BSD BSD-2 UoI-NCSA"
SLOT="0"
IUSE="examples"
-RDEPEND="<sys-devel/clang-11:="
+RDEPEND="<sys-devel/clang-13:="
DEPEND="
${RDEPEND}
${PYTHON_DEPS}
@@ -36,10 +36,12 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch"
- "${FILESDIR}/${PN}-1.14.0-llvm-10.patch"
- "${FILESDIR}/${PN}-1.13.0-werror.patch"
+ "${FILESDIR}/${PN}-9999-llvm.patch"
+ "${FILESDIR}/${PN}-9999-werror.patch"
)
+CMAKE_BUILD_TYPE="RelWithDebInfo"
+
llvm_check_deps() {
has_version -d "sys-devel/clang:${LLVM_SLOT}"
}
@@ -60,6 +62,7 @@ src_configure() {
local mycmakeargs=(
"-DARM_ENABLED=$(usex arm)"
"-DCMAKE_SKIP_RPATH=ON"
+ "-DISPC_NO_DUMPS=ON"
)
cmake_src_configure
}
@@ -71,11 +74,11 @@ src_install() {
if use examples; then
insinto "/usr/share/doc/${PF}/examples"
docompress -x "/usr/share/doc/${PF}/examples"
- doins -r "${BUILD_DIR}"/examples/*
+ doins -r "${S}"/examples/*
fi
}
src_test() {
# Inject path to prevent using system ispc
- PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} run_tests.py || die "Testing failed under ${EPYTHON}"
+ PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2022-06-12 12:02 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-06-12 12:02 UTC (permalink / raw
To: gentoo-commits
commit: 3f7c76111dcab8a628c26847de1ae045bacbc49d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 12:02:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 12:02:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7c7611
dev-lang/ispc: add 1.18.0
Closes: https://bugs.gentoo.org/841731
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/Manifest | 1 +
dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch | 16 +++++
dev-lang/ispc/ispc-1.18.0.ebuild | 80 ++++++++++++++++++++++
3 files changed, 97 insertions(+)
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 6c9781daedf4..2214e159cf2b 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,2 +1,3 @@
DIST ispc-1.16.1.tar.gz 19549428 BLAKE2B 742d94208d39f0560c3f2199ee06fc12f3ec2cf47c1039212219c6aa106b20cd58219e5d439c4fd1ce4a0c1a423655d0c2113a2a78152c99b4d77452171acce6 SHA512 89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463
DIST ispc-1.17.0.tar.gz 19436681 BLAKE2B 11af6e22c4c297a2fbd0ae1bfe2a37ce2f836607b2caf42634cff0b0fe1116542e71f056de12e3472724db04f1c5174c0deb47c2bd64fb756b4bdaef48935707 SHA512 b1c67381bb8b71d268c6e68c95cc5e2d64411ce351506de96d31850b879f7777fbc1cb33f3761437f84e52ae726fabbb794ebba9cf05d5200acaca07a2ebf0ac
+DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
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
new file mode 100644
index 000000000000..127b7095a778
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.18.0-curses-cmake.patch
@@ -0,0 +1,16 @@
+--- 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/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
new file mode 100644
index 000000000000..47d74e37d160
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+LLVM_MAX_SLOT=14
+inherit cmake python-any-r1 llvm
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.io/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ispc/ispc.git"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-llvm.patch"
+ "${FILESDIR}"/ispc-1.18.0-curses-cmake.patch
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if use amd64; then
+ # On amd64 systems, build system enables x86/i686 build too.
+ # This ebuild doesn't even have multilib support, nor need it.
+ # https://bugs.gentoo.org/730062
+ ewarn "Removing auto-x86 build on amd64"
+ sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DARM_ENABLED=$(usex arm)
+ -DCMAKE_SKIP_RPATH=ON
+ -DISPC_NO_DUMPS=ON
+ -DISPC_INCLUDE_EXAMPLES=OFF
+ -DISPC_INCLUDE_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # Inject path to prevent using system ispc
+ PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/bin/ispc
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2022-10-01 3:12 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-10-01 3:12 UTC (permalink / raw
To: gentoo-commits
commit: d247aa7519850a5a67619659b91249892d4b5c41
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 03:11:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 03:12:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d247aa75
dev-lang/ispc: fix non-9999 patch
Closes: https://bugs.gentoo.org/873676
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/files/ispc-1.18.0-llvm.patch | 39 ++++++++++++++++++++++++++++++
dev-lang/ispc/ispc-1.18.0.ebuild | 4 +--
dev-lang/ispc/ispc-9999.ebuild | 4 +--
3 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/dev-lang/ispc/files/ispc-1.18.0-llvm.patch b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
new file mode 100644
index 000000000000..7303ac0fd6e8
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.18.0-llvm.patch
@@ -0,0 +1,39 @@
+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>
diff --git a/dev-lang/ispc/ispc-1.18.0.ebuild b/dev-lang/ispc/ispc-1.18.0.ebuild
index 47d74e37d160..ec835cb94bdb 100644
--- a/dev-lang/ispc/ispc-1.18.0.ebuild
+++ b/dev-lang/ispc/ispc-1.18.0.ebuild
@@ -32,8 +32,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-llvm.patch"
- "${FILESDIR}"/ispc-1.18.0-curses-cmake.patch
+ "${FILESDIR}"/${PN}-1.18.0-llvm.patch
+ "${FILESDIR}"/${PN}-1.18.0-curses-cmake.patch
)
pkg_setup() {
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild
index 8da425ce2b9c..843faa818262 100644
--- a/dev-lang/ispc/ispc-9999.ebuild
+++ b/dev-lang/ispc/ispc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-9999-llvm.patch"
+ "${FILESDIR}"/${PN}-9999-llvm.patch
)
CMAKE_BUILD_TYPE="RelWithDebInfo"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2023-05-01 15:15 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 7c5d27c59fe681f7e7ac938ec8258d7464e85cc4
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon May 1 14:01:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 15:14:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5d27c5
dev-lang/ispc: Bump to 1.19.0
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/Manifest | 1 +
dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch | 16 +++++
dev-lang/ispc/ispc-1.19.0.ebuild | 78 ++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 5357aeb5efa4..188333b63a8f 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1 +1,2 @@
DIST ispc-1.18.0.tar.gz 19469764 BLAKE2B dd95ec177120899066d5539add0f35685d73f65512e8be1cc42cf6725741d7f307fbecefc22c4944d9be0e3659d511546b15506213f3dbb97829953507996283 SHA512 350b43876d6885ab4c5c0d49c5b44323fd258d5cf7c68fcdea774baa92589542f2caeea93c347a37f0dab3dcf14e7b3e685973b41694f08ce7a2da64dc81bf06
+DIST ispc-1.19.0.tar.gz 19577782 BLAKE2B 5ad6eeeeb0bb27f2a27267a26a729693bd16250ae5e8740728290fe6ad85c7ecd4da40f316f2ca6b1447ff3a13f6949db4ed2af6ebf2c6ce6ba43620dfb1943d SHA512 140f16bc0f9e0a94853b50a5433be9196ee09b6c70a1840d400d0d201143da8cb2b1b92a857acf5856ed3410bfffd17678eb1029996f9007fe947f5ac78bf1bb
diff --git a/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch b/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch
new file mode 100644
index 000000000000..19a19e871ee7
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.19.0-curses-cmake.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -598,11 +598,8 @@ else()
+ target_link_libraries(${PROJECT_NAME} pthread tinfo.a curses.a)
+ else()
+ find_package(Curses 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 ${CURSES_CURSES_LIBRARY})
++ set(CURSES_NEED_NCURSES ON)
++ target_link_libraries(${PROJECT_NAME} pthread ${CURSES_LIBRARIES})
+ endif()
+ endif()
+
diff --git a/dev-lang/ispc/ispc-1.19.0.ebuild b/dev-lang/ispc/ispc-1.19.0.ebuild
new file mode 100644
index 000000000000..c03f574d20cc
--- /dev/null
+++ b/dev-lang/ispc/ispc-1.19.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+LLVM_MAX_SLOT=15
+inherit cmake python-any-r1 llvm
+
+DESCRIPTION="Intel SPMD Program Compiler"
+HOMEPAGE="https://ispc.github.io/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ispc/ispc.git"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD BSD-2 UoI-NCSA"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.19.0-curses-cmake.patch
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if use amd64; then
+ # On amd64 systems, build system enables x86/i686 build too.
+ # This ebuild doesn't even have multilib support, nor need it.
+ # https://bugs.gentoo.org/730062
+ ewarn "Removing auto-x86 build on amd64"
+ sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DARM_ENABLED=$(usex arm)
+ -DCMAKE_SKIP_RPATH=ON
+ -DISPC_INCLUDE_EXAMPLES=OFF
+ -DISPC_INCLUDE_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ # Inject path to prevent using system ispc
+ PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}"
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/bin/ispc
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/
@ 2023-05-03 11:26 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-05-03 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 83c64ad3ecf5c63e3063ba318e86e3c8c8821a21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 11:26:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 3 11:26:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c64ad3
dev-lang/ispc: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/895572
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ispc/files/ispc-1.19.0-gcc13.patch | 27 +++++++++++++++++++++++++++
dev-lang/ispc/ispc-1.19.0.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch b/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch
new file mode 100644
index 000000000000..e2bae38ae581
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.19.0-gcc13.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/895572
+https://github.com/ispc/ispc/commit/ffc75e464ff2b8fce7dbf74f1846ebd0852bc6f9
+
+From ffc75e464ff2b8fce7dbf74f1846ebd0852bc6f9 Mon Sep 17 00:00:00 2001
+From: Luya Tshimbalanga <luya@fedoraproject.org>
+Date: Tue, 28 Feb 2023 17:20:21 -0800
+Subject: [PATCH] Fix build with GCC 13 and possibly Clang 15
+
+This fix add missing <cstdint> include to handle "uint32_t".
+--- a/src/target_registry.h
++++ b/src/target_registry.h
+@@ -1,5 +1,5 @@
+ /*
+- Copyright (c) 2019-2021, Intel Corporation
++ Copyright (c) 2019-2023, Intel Corporation
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+@@ -40,6 +40,7 @@
+ #include "bitcode_lib.h"
+
+ #include <bitset>
++#include <cstdint>
+ #include <map>
+ #include <vector>
+
+
diff --git a/dev-lang/ispc/ispc-1.19.0.ebuild b/dev-lang/ispc/ispc-1.19.0.ebuild
index c03f574d20cc..df12999e9acb 100644
--- a/dev-lang/ispc/ispc-1.19.0.ebuild
+++ b/dev-lang/ispc/ispc-1.19.0.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.19.0-curses-cmake.patch
+ "${FILESDIR}"/${P}-gcc13.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-05-03 11:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-01 15:15 [gentoo-commits] repo/gentoo:master commit in: dev-lang/ispc/, dev-lang/ispc/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-03 11:26 Sam James
2022-10-01 3:12 Sam James
2022-06-12 12:02 Sam James
2021-05-26 5:21 Joonas Niilola
2020-07-29 16:52 Andreas Sturmlechner
2020-06-28 16:45 Christoph Junghans
2020-06-28 16:45 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox