Date: Saturday, January 7, 2023 @ 20:02:27
Author: foutrelis
Revision: 1381777
upgpkg: sparse 0.6.4-4: switch to llvm14
Added:
sparse/trunk/llvm14.patch
Modified:
sparse/trunk/PKGBUILD
--------------+
PKGBUILD | 22 +++++++++++++++++-----
llvm14.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-07 19:55:13 UTC (rev 1381776)
+++ PKGBUILD 2023-01-07 20:02:27 UTC (rev 1381777)
@@ -5,7 +5,7 @@
pkgname=sparse
pkgver=0.6.4
-pkgrel=3
+pkgrel=4
pkgdesc='Semantic parser for C'
arch=('x86_64')
url='http://sparse.wiki.kernel.org/'
@@ -17,13 +17,19 @@
)
makedepends=(
'git'
- 'llvm'
+ 'llvm14'
'gtk3'
)
-optdepends=('gtk3: for test-inspect')
+optdepends=(
+ 'llvm14-libs: for sparse-llvm'
+ 'llvm14: for sparsec'
+ 'gtk3: for test-inspect'
+)
_commit='c4706aa764f3ae68258ba60be6325a5662900362'
-source=("git+https://git.kernel.org/pub/scm/devel/sparse/sparse.git#commit=$_commit";)
-b2sums=('SKIP')
+source=("git+https://git.kernel.org/pub/scm/devel/sparse/sparse.git#commit=$_commit";
+ llvm14.patch)
+b2sums=('SKIP'
+
'd13e86d816c0ec3244ac566057fe1830555263989471d5ecc9f6d52bf4b2b26fc7835bd4f2f0e601a903890b25e61e7fc3ee663f88c43c4fa3cfdca1789a167c')
pkgver() {
cd sparse
@@ -31,6 +37,12 @@
git describe --tags | sed 's/^v//'
}
+prepare() {
+ cd sparse
+
+ patch -Np1 -i ../llvm14.patch
+}
+
build() {
make -C sparse
}
Added: llvm14.patch
===================================================================
--- llvm14.patch (rev 0)
+++ llvm14.patch 2023-01-07 20:02:27 UTC (rev 1381777)
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index 84b4527f..01fd2b21 100644
+--- a/Makefile
++++ b/Makefile
+@@ -193,7 +193,7 @@ $(warning Your system does not have gtk3/gtk2, disabling
test-inspect)
+ endif
+
+ # Can we use LLVM (needed for ... sparse-llvm)?
+-LLVM_CONFIG:=llvm-config
++LLVM_CONFIG:=llvm-config-14
+ HAVE_LLVM:=$(shell $(LLVM_CONFIG) --version >/dev/null 2>&1 && echo 'yes')
+ ifeq ($(HAVE_LLVM),yes)
+ arch := $(shell uname -m)
+diff --git a/sparse-llvm-dis b/sparse-llvm-dis
+index 2958217b..453fcf85 100755
+--- a/sparse-llvm-dis
++++ b/sparse-llvm-dis
+@@ -4,7 +4,7 @@
+
+ set +e
+
+-DIS=$("${LLVM_CONFIG:-llvm-config}" --bindir)/llvm-dis
++DIS=$("${LLVM_CONFIG:-llvm-config-14}" --bindir)/llvm-dis
+
+ if [ $# -eq 0 ]; then
+ echo "$(basename $0): no input files"
+diff --git a/sparsec b/sparsec
+index 3f9b60c6..0d24ffe8 100755
+--- a/sparsec
++++ b/sparsec
+@@ -32,7 +32,7 @@ done
+ TMPFILE=`mktemp -t tmp.XXXXXX`
+
+
+-LLC=`"${LLVM_CONFIG:-llvm-config}" --bindir`/llc
++LLC=`"${LLVM_CONFIG:-llvm-config-14}" --bindir`/llc
+
+ LLC_ARCH_OPTS=
+ case "$(uname -s)" in
+diff --git a/sparsei b/sparsei
+index 3232200e..bfd33f7e 100755
+--- a/sparsei
++++ b/sparsei
+@@ -6,7 +6,7 @@ SPARSEOPTS=
+ JIT_OPT=
+
+ DIRNAME=`dirname $0`
+-LLI=`"${LLVM_CONFIG:-llvm-config}" --bindir`/lli
++LLI=`"${LLVM_CONFIG:-llvm-config-14}" --bindir`/lli
+
+ if [ $# -eq 0 ]; then
+ echo "`basename $0`: no input files"
