mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
dev-lang/ispc: drop 1.14.1
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST ispc-1.14.1.tar.gz 19454189 BLAKE2B 615698e64ffbd2c82808d6ddd0b5b90f7c52bb8c202a04364d63af26f0e062631f4a8ad01895c1a4f1a8f11e7f91aec381354ddd873d0a4f2908431dcaabe383 SHA512 468e8a44408047ba7b43dc4baf05c2659093b986e131ebe973954ff3b9cf707a4ed22c705b6e01a9abc9a3911669ab31cd191449442c4ac73112a1297da32c5e
|
||||
DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215
|
||||
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
@@ -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>
|
||||
|
||||
#ifdef ISPC_GENX_ENABLED
|
||||
#include <llvm/GenXIntrinsics/GenXIntrinsics.h>
|
||||
@@ -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) {
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit cmake toolchain-funcs python-any-r1 llvm
|
||||
|
||||
LLVM_MAX_SLOT=10
|
||||
|
||||
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"
|
||||
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-11:="
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
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"
|
||||
)
|
||||
|
||||
llvm_check_deps() {
|
||||
has_version -d "sys-devel/clang:${LLVM_SLOT}"
|
||||
}
|
||||
|
||||
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
|
||||
elog "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"
|
||||
)
|
||||
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
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Inject path to prevent using system ispc
|
||||
PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} run_tests.py || die "Testing failed under ${EPYTHON}"
|
||||
}
|
||||
Reference in New Issue
Block a user