mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
llvm12: enable with release artefacts
This commit is contained in:
Jerome Duval
@@ -32,26 +32,27 @@ HOMEPAGE="https://www.llvm.org/"
|
||||
COPYRIGHT="2003-2019 University of Illinois at Urbana-Champaign"
|
||||
LICENSE="Apache v2 with LLVM Exception"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc4/llvm-12.0.0rc4.src.tar.xz"
|
||||
CHECKSUM_SHA256="6efbb5c3be4538a077915aab60de8c36fb308b976e3bcd1c0b04161362312eca"
|
||||
SOURCE_DIR="llvm-12.0.0rc4.src"
|
||||
SOURCE_URI_2="https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc4/clang-12.0.0rc4.src.tar.xz"
|
||||
CHECKSUM_SHA256_2="7ce1b0168eaf8d1589f4e09e539d7b64327a7f3d984557687cdeb9809c385e85"
|
||||
SOURCE_DIR_2="clang-12.0.0rc4.src"
|
||||
SOURCE_URI_3="https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc4/clang-tools-extra-12.0.0rc4.src.tar.xz"
|
||||
CHECKSUM_SHA256_3="4f9130cdf2d88b77a6a8d3d84c614bb14f1af8c43d75de27feeb9854917a38d4"
|
||||
SOURCE_DIR_3="clang-tools-extra-12.0.0rc4.src"
|
||||
SOURCE_URI_4="https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc4//compiler-rt-12.0.0rc4.src.tar.xz"
|
||||
CHECKSUM_SHA256_4="3f99813ab73dfa90b65ff873abd5048a02fc9494060a0e719513a382468ebb05"
|
||||
SOURCE_DIR_4="compiler-rt-12.0.0rc4.src"
|
||||
SOURCE_URI_5="https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0-rc4//lld-12.0.0rc4.src.tar.xz"
|
||||
CHECKSUM_SHA256_5="e152617312980ea674e17b4acca3751f8c86adb60ecda2d3cef1461b37ec3765"
|
||||
SOURCE_DIR_5="lld-12.0.0rc4.src"
|
||||
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256="49dc47c8697a1a0abd4ee51629a696d7bfe803662f2a7252a3b16fc75f3a8b50"
|
||||
SOURCE_DIR="llvm-$portVersion.src"
|
||||
SOURCE_URI_2="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/clang-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256_2="e26e452e91d4542da3ebbf404f024d3e1cbf103f4cd110c26bf0a19621cca9ed"
|
||||
SOURCE_DIR_2="clang-$portVersion.src"
|
||||
SOURCE_URI_3="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/clang-tools-extra-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256_3="ad41e0b527a65ade95c1ba690a5434cefaab4a2daa1be307caaa1e8541fe6d5c"
|
||||
SOURCE_DIR_3="clang-tools-extra-$portVersion.src"
|
||||
SOURCE_URI_4="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/compiler-rt-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256_4="85a8cd0a62413eaa0457d8d02f8edac38c4dc0c96c00b09dc550260c23268434"
|
||||
SOURCE_DIR_4="compiler-rt-$portVersion.src"
|
||||
SOURCE_URI_5="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/lld-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256_5="2cb7d497f3ce33ce8a2c50ad26ec93a8c45f57268d4d96953cd0f25566f753fd"
|
||||
SOURCE_DIR_5="lld-$portVersion.src"
|
||||
PATCHES="llvm-$portVersion.patchset"
|
||||
PATCHES_2="clang-$portVersion.patchset"
|
||||
PATCHES_5="lld-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
llvm12$secondaryArchSuffix = $portVersion compat >= 12
|
||||
@@ -1,4 +1,4 @@
|
||||
From 090bb7d67f32c41a0f3caeb834000fbcc91ac3bb Mon Sep 17 00:00:00 2001
|
||||
From e40bf3e0bb6fdb433e40c29b271874672deaec9b Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 20 Jan 2016 21:13:28 +0000
|
||||
Subject: llvm-config: use /develop/headers instead of /include
|
||||
@@ -52,7 +52,7 @@ index 1a2f045..ee0cd89 100644
|
||||
2.30.0
|
||||
|
||||
|
||||
From 9c738041dffad94b591ecc4edc3129c6c0d31f31 Mon Sep 17 00:00:00 2001
|
||||
From 5a8e421ca5809e39b4380b8f8818eb93c9355be3 Mon Sep 17 00:00:00 2001
|
||||
From: Calvin Hill <calvin@hakobaito.co.uk>
|
||||
Date: Sun, 9 Sep 2018 16:11:42 +0100
|
||||
Subject: import header dir suffix patch from 3dEyes.
|
||||
@@ -75,7 +75,7 @@ index ee0cd89..87a23c4 100644
|
||||
2.30.0
|
||||
|
||||
|
||||
From f3f431960bb61dc388c2eab5d5e0d9ae3e57244a Mon Sep 17 00:00:00 2001
|
||||
From f8619ab6eda979fc9c1b64a56ada345da378cd10 Mon Sep 17 00:00:00 2001
|
||||
From: Calvin Hill <calvin@hakobaito.co.uk>
|
||||
Date: Sun, 9 Sep 2018 16:17:33 +0100
|
||||
Subject: llvm: allow llvm gtests to build on Haiku.
|
||||
@@ -98,3 +98,82 @@ index 17410d3..3e039a8 100644
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From 7a2887c163ff96c6ad74cbc1d3032fad1272b82f Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 3 Apr 2021 23:20:23 +0200
|
||||
Subject: Haiku: link against libbsd for wait4()
|
||||
|
||||
rusage doesn't have a ru_maxrss field
|
||||
|
||||
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
|
||||
index cdee114..832ab28 100644
|
||||
--- a/lib/Support/CMakeLists.txt
|
||||
+++ b/lib/Support/CMakeLists.txt
|
||||
@@ -36,6 +36,10 @@ elseif( CMAKE_HOST_UNIX )
|
||||
if( FUCHSIA )
|
||||
set(system_libs ${system_libs} zircon)
|
||||
endif()
|
||||
+ if( HAIKU )
|
||||
+ add_definitions(-D_DEFAULT_SOURCE)
|
||||
+ set(system_libs ${system_libs} bsd)
|
||||
+ endif()
|
||||
endif( MSVC OR MINGW )
|
||||
|
||||
# Delay load shell32.dll if possible to speed up process startup.
|
||||
diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc
|
||||
index fb56fa4..f6f0f52 100644
|
||||
--- a/lib/Support/Unix/Program.inc
|
||||
+++ b/lib/Support/Unix/Program.inc
|
||||
@@ -452,7 +452,11 @@ ProcessInfo llvm::sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait,
|
||||
if (ProcStat) {
|
||||
std::chrono::microseconds UserT = toDuration(Info.ru_utime);
|
||||
std::chrono::microseconds KernelT = toDuration(Info.ru_stime);
|
||||
+#ifndef __HAIKU__
|
||||
uint64_t PeakMemory = static_cast<uint64_t>(Info.ru_maxrss);
|
||||
+#else
|
||||
+ uint64_t PeakMemory = 0;
|
||||
+#endif
|
||||
*ProcStat = ProcessStatistics{UserT + KernelT, UserT, PeakMemory};
|
||||
}
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From d75496fd4839cc6ca15086b23782ca1c9f2b232e Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 3 Apr 2021 23:21:42 +0200
|
||||
Subject: Haiku: link against libnetwork.so
|
||||
|
||||
for socket, setsockopt, ...
|
||||
|
||||
diff --git a/tools/llvm-jitlink/CMakeLists.txt b/tools/llvm-jitlink/CMakeLists.txt
|
||||
index 8d511b1..6292ec5 100644
|
||||
--- a/tools/llvm-jitlink/CMakeLists.txt
|
||||
+++ b/tools/llvm-jitlink/CMakeLists.txt
|
||||
@@ -24,4 +24,8 @@ add_llvm_tool(llvm-jitlink
|
||||
llvm-jitlink-macho.cpp
|
||||
)
|
||||
|
||||
+if( HAIKU )
|
||||
+ target_link_libraries(llvm-jitlink PRIVATE network)
|
||||
+endif()
|
||||
+
|
||||
export_executable_symbols(llvm-jitlink)
|
||||
diff --git a/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt b/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt
|
||||
index f6d882d..e2a3343 100644
|
||||
--- a/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt
|
||||
+++ b/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt
|
||||
@@ -11,4 +11,8 @@ add_llvm_utility(llvm-jitlink-executor
|
||||
intrinsics_gen
|
||||
)
|
||||
|
||||
+if( HAIKU )
|
||||
+ target_link_libraries(llvm-jitlink-executor PRIVATE network)
|
||||
+endif()
|
||||
+
|
||||
export_executable_symbols(llvm-jitlink-executor)
|
||||
--
|
||||
2.30.0
|
||||
|
||||
Reference in New Issue
Block a user