mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
llvm9: switch to python3.9 (#8614)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -31,7 +31,7 @@ other than the ones listed above.
|
||||
HOMEPAGE="https://www.llvm.org/"
|
||||
COPYRIGHT="2003-2019 University of Illinois at Urbana-Champaign"
|
||||
LICENSE="Apache v2 with LLVM Exception"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-$portVersion.src.tar.xz"
|
||||
CHECKSUM_SHA256="00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a"
|
||||
SOURCE_DIR="llvm-$portVersion.src"
|
||||
@@ -49,6 +49,7 @@ CHECKSUM_SHA256_5="86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0
|
||||
SOURCE_DIR_5="lld-$portVersion.src"
|
||||
PATCHES="llvm-$portVersion.patchset"
|
||||
PATCHES_2="clang-$portVersion.patchset"
|
||||
PYTHON3_VERSION="3.9"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2 ?x86"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -404,7 +405,7 @@ PROVIDES_clang_analysis="
|
||||
"
|
||||
REQUIRES_clang_analysis="
|
||||
llvm9${secondaryArchSuffix}_clang == $portVersion base
|
||||
cmd:python
|
||||
cmd:python$PYTHON3_VERSION
|
||||
"
|
||||
CONFLICTS_clang_analysis="
|
||||
llvm${secondaryArchSuffix}_clang_analysis
|
||||
@@ -449,20 +450,19 @@ REQUIRES_libs="
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PYTHON3_VERSION="3.7"
|
||||
PROVIDES_python3="
|
||||
llvm9${secondaryArchSuffix}_python3 = $portVersion
|
||||
PROVIDES_python39="
|
||||
llvm9${secondaryArchSuffix}_python39 = $portVersion
|
||||
cmd:lit
|
||||
"
|
||||
REQUIRES_python3="
|
||||
setuptools_python3
|
||||
REQUIRES_python39="
|
||||
setuptools_python39
|
||||
cmd:python$PYTHON3_VERSION
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libz$secondaryArchSuffix
|
||||
setuptools_python3
|
||||
setuptools_python39
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
@@ -474,7 +474,6 @@ BUILD_PREREQUIRES="
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:ninja
|
||||
cmd:python2
|
||||
cmd:python$PYTHON3_VERSION
|
||||
cmd:sed
|
||||
"
|
||||
@@ -508,7 +507,7 @@ BUILD()
|
||||
-DCMAKE_SKIP_RPATH=YES $cmakeFlags \
|
||||
-DLLVM_ENABLE_RTTI=ON -DLLVM_LINK_LLVM_DYLIB=YES \
|
||||
-DLLVM_ENABLE_BUILD_TESTS=YES \
|
||||
-G Ninja \
|
||||
-G Ninja -Wno-dev \
|
||||
..
|
||||
|
||||
ninja
|
||||
@@ -523,7 +522,7 @@ INSTALL()
|
||||
ninja install
|
||||
|
||||
# GENERIC: all python_setuptools-based installs need this
|
||||
local pythonPackageName="${portName}_python3-$portFullVersion"
|
||||
local pythonPackageName="${portName}_python39-$portFullVersion"
|
||||
local packageLinksDir=$(dirname $portPackageLinksDir)
|
||||
python=$packageLinksDir/${pythonPackageName}/cmd~python$PYTHON3_VERSION/bin/python$PYTHON3_VERSION
|
||||
pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
|
||||
@@ -601,7 +600,7 @@ INSTALL()
|
||||
$libDir/libRemarks*
|
||||
|
||||
# python3 package
|
||||
packageEntries python3 \
|
||||
packageEntries python39 \
|
||||
$binDir/lit \
|
||||
$prefix/lib/python*
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From eeb679259a26c70e6b6ed1bf339a8f80a7064d91 Mon Sep 17 00:00:00 2001
|
||||
From a98d3fb19e3a3c1191cdf9aee748bc0105007226 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
|
||||
@@ -49,10 +49,10 @@ index 7ef7c46..5282662 100644
|
||||
LinkDyLib = false;
|
||||
LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
|
||||
--
|
||||
2.21.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From a77fe7f5be1df7c39c747d3b94268f1e52ddf366 Mon Sep 17 00:00:00 2001
|
||||
From ea077cb37489b56952a4172017d91713669111d4 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.
|
||||
@@ -72,10 +72,10 @@ index 5282662..084f26a 100644
|
||||
#else
|
||||
ActiveIncludeDir = ActivePrefix + "/include";
|
||||
--
|
||||
2.21.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From f9e2b45dd73d075d2388277927cf35089f00422d Mon Sep 17 00:00:00 2001
|
||||
From c95c09daf293d1b8cda6b39ef49b3ca4af8dd4f4 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.
|
||||
@@ -96,10 +96,10 @@ index d36e820..e6dbb2d 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 3306d07574b3e627d3854a060cea2c74cc6f25dc Mon Sep 17 00:00:00 2001
|
||||
From 198b8c3072bca5efad090acd95745caaa656bd93 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 12 Mar 2019 21:01:42 +0100
|
||||
Subject: llvm: sysexits.h requires _BSD_SOURCE on Haiku beta1.
|
||||
@@ -120,5 +120,27 @@ index 634c16a..4ab46b9 100644
|
||||
#ifdef HAVE_BACKTRACE
|
||||
# include BACKTRACE_HEADER // For backtrace().
|
||||
--
|
||||
2.21.0
|
||||
2.37.3
|
||||
|
||||
|
||||
From 56bb025a38318c015a112ceaf1c9486257a22a90 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Thu, 18 May 2023 11:37:49 +0200
|
||||
Subject: fix for: error: 'numeric_limits' is not a member of 'std'
|
||||
|
||||
|
||||
diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h
|
||||
index 0705e21..4caa5ad 100644
|
||||
--- a/utils/benchmark/src/benchmark_register.h
|
||||
+++ b/utils/benchmark/src/benchmark_register.h
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef BENCHMARK_REGISTER_H
|
||||
#define BENCHMARK_REGISTER_H
|
||||
|
||||
+#include <limits>
|
||||
#include <vector>
|
||||
|
||||
#include "check.h"
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user