[crux-commits] ports/opt (3.6): llvm: minor cleanup

crux at crux.nu crux at crux.nu
Mon Jul 6 14:14:13 UTC 2020


commit 9c9e8a287522f12347fb3300ed87613ee9581d0a
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Jul 6 16:13:33 2020 +0200

    llvm: minor cleanup

diff --git a/llvm/.signature b/llvm/.signature
index 75fbd481a..c5556b24c 100644
--- a/llvm/.signature
+++ b/llvm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/WSCor5rpbQWHQ9yGUdF2Ju1t6onFYo2rXj9Bk6SyFQ9+7hZ05evttEag6QRAzNVeyq/KS/AqYhxPgTd9vO5cQM=
-SHA256 (Pkgfile) = 72fadc794b04a4ba0b1f877ad5d7ad2020412de436d251c9fdc8613f77c0ce8a
+RWSE3ohX2g5d/YZGIg/cgvjbHaKVDzAMOBsCzQYmHU6MUbujvwFtIxtQRaxn7kIU6QDOZYxvtWFk+FrPIbtsXaYCSCrJxfiBnwg=
+SHA256 (Pkgfile) = a4b007a4de7eaadd6a870f353f469644a7b3486d4702d9254ba3e1fd7a3fb1b6
 SHA256 (.footprint) = dbf1b795b0bd9df16336812f61aee4e2f0a169488325789c842722803932a1ca
 SHA256 (llvm-10.0.0.src.tar.xz) = df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf
 SHA256 (llvm-config.h) = 2227b83b904348e5530f3475c978e11cb0f05a85024781dcb49ac86b65582707
diff --git a/llvm/Pkgfile b/llvm/Pkgfile
index 6fe2623d1..c43e5f19f 100644
--- a/llvm/Pkgfile
+++ b/llvm/Pkgfile
@@ -1,41 +1,35 @@
 # Description: LLVM compiler backend
-# URL:         http://llvm.org/
+# URL:         https://llvm.org/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on: cmake libxml2 ninja
+# Depends on:  cmake libxml2 ninja
 
 name=llvm
 version=10.0.0
 release=1
-source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz \
-  llvm-config.h)
+source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm-$version.src.tar.xz
+        llvm-config.h)
 
 build() {
   export CC=gcc
   export CXX=g++
 
-  cd $name-$version.src
-
-  mkdir build
-  cd build
-
-  cmake .. -G Ninja \
+  cmake -S$name-$version.src -Bbuild -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;BPF' \
+    -DLLVM_BUILD_LLVM_DYLIB=1 \
+    -DLLVM_LINK_LLVM_DYLIB=1 \
+    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
     -DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
     -DLLVM_INCLUDE_EXAMPLES=0 \
     -DLLVM_INCLUDE_TESTS=0 \
     -DLLVM_ENABLE_FFI=1 \
     -DLLVM_ENABLE_RTTI=1 \
     -DLLVM_ENABLE_OCAMLDOC=0 \
-    -DLLVM_TARGETS_TO_BUILD='X86;AMDGPU;BPF' \
-    -DLLVM_BUILD_LLVM_DYLIB=1 \
-    -DLLVM_LINK_LLVM_DYLIB=1 \
     -DLLVM_INSTALL_UTILS=1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_APPEND_VC_REV=0 \
     -Wno-dev
-
-  ninja
-  DESTDIR=$PKG ninja install
+  cmake --build build
+  DESTDIR=$PKG cmake --install build
 
   # multilib stub
   mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h


More information about the crux-commits mailing list