diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 115 |
2 files changed, 66 insertions, 64 deletions
@@ -1,5 +1,5 @@ pkgbase = llvm-lw-git - pkgver = 9.0.0_r313655.2ea8dbf5642 + pkgver = 9.0.0_r315148.03c4e2663ce pkgrel = 1 url = https://llvm.org/ arch = x86_64 @@ -24,11 +24,11 @@ pkgbase = llvm-lw-git pkgname = llvm-lw-git pkgdesc = Collection of modular and reusable compiler and toolchain technologies - depends = llvm-libs + depends = llvm-libs-lw-git depends = perl optdepends = python-setuptools: for using lit (LLVM Integrated Tester) - provides = llvm - provides = llvm-svn + provides = llvm-git + conflicts = llvm pkgname = llvm-libs-lw-git pkgdesc = LLVM runtime libraries @@ -38,14 +38,13 @@ pkgname = llvm-libs-lw-git depends = libedit depends = ncurses depends = libxml2 - provides = llvm-libs - provides = llvm-libs-svn + provides = llvm-libs-git pkgname = llvm-ocaml-lw-git pkgdesc = OCaml bindings for LLVM depends = llvm depends = ocaml=4.07.1 depends = ocaml-ctypes - provides = llvm-ocaml - provides = llvm-ocaml-svn + provides = llvm-ocaml-git + conflicts = llvm-ocaml @@ -15,7 +15,7 @@ pkgname=('llvm-lw-git' 'llvm-libs-lw-git' 'llvm-ocaml-lw-git') -pkgver=9.0.0_r313655.2ea8dbf5642 +pkgver=9.0.0_r315148.03c4e2663ce pkgrel=1 _ocaml_ver=4.07.1 arch=('x86_64') @@ -31,7 +31,7 @@ sha256sums=('SKIP' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') pkgver() { - cd "${srcdir}/llvm-project/llvm" + cd llvm-project/llvm # This will almost match the output of `llvm-config --version` when the # LLVM_APPEND_VC_REV cmake flag is turned on. The only difference is @@ -44,108 +44,111 @@ pkgver() { echo "${_pkgver}" } -prepare() { - cd "$srcdir/llvm-project/llvm" - mkdir build -} - build() { - cd "$srcdir/llvm-project/llvm/build" - - cmake .. -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_HOST_TRIPLE=$CHOST \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_INSTALL_UTILS=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_FFI=ON \ - -DLLVM_BUILD_TESTS=ON \ - -DLLVM_BUILD_DOCS=ON \ - -DLLVM_ENABLE_SPHINX=ON \ - -DLLVM_ENABLE_DOXYGEN=OFF \ - -DSPHINX_WARNINGS_AS_ERRORS=OFF \ - -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ - -DLLVM_BINUTILS_INCDIR=/usr/include \ - -DLLVM_VERSION_SUFFIX="" \ - -DLLVM_APPEND_VC_REV=ON - ninja all ocaml_doc + + if [ -d _build ]; then + rm -rf _build + fi + mkdir _build + cd _build + + cmake "$srcdir"/llvm-project/llvm -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLLVM_HOST_TRIPLE=$CHOST \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_INSTALL_UTILS=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + -DLLVM_BUILD_TESTS=ON \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_ENABLE_DOXYGEN=OFF \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ + -DLLVM_BINUTILS_INCDIR=/usr/include \ + -DLLVM_VERSION_SUFFIX="" \ + -DLLVM_APPEND_VC_REV=ON + if [[ ! $MAKEFLAGS ]]; then + ninja all ocaml_doc + else + ninja "$MAKEFLAGS" all ocaml_doc + fi } check() { - cd "$srcdir/llvm-project/llvm/build" + cd _build ninja check } package_llvm-lw-git() { pkgdesc="Collection of modular and reusable compiler and toolchain technologies" - depends=('llvm-libs' 'perl') + depends=('llvm-libs-lw-git' 'perl') optdepends=('python-setuptools: for using lit (LLVM Integrated Tester)') - provides=('llvm' 'llvm-svn') + conflicts=('llvm') + provides=('llvm-git') - cd "$srcdir/llvm-project/llvm/build" + cd _build DESTDIR="$pkgdir" ninja install # Include lit for running lit-based tests in other projects - pushd ../utils/lit + pushd "$srcdir"/llvm-project/llvm/utils/lit python3 setup.py install --root="$pkgdir" -O1 popd # Remove documentation sources rm -r "$pkgdir"/usr/share/doc/llvm/html/{_sources,.buildinfo} - # The runtime libraries go into llvm-libs - mv -f "$pkgdir"/usr/lib/lib{LLVM,LTO}*.so* "$srcdir" - mv -f "$pkgdir"/usr/lib/LLVMgold.so "$srcdir" + + # The runtime libraries go into llvm-lw-libs + mv -f "$pkgdir"/usr/lib/lib{LLVM-*.so,LTO.so.*} "$srcdir" + # Remove files which conflict with llvm-libs + rm "$pkgdir"/usr/lib/{LLVMgold,lib{LLVM,LTO}}.so + # OCaml bindings go to a separate package rm -rf "$srcdir"/ocaml.{lib,doc} - mv "$pkgdir/usr/lib/ocaml" "$srcdir/ocaml.lib" - mv "$pkgdir/usr/share/doc/llvm/ocaml-html" "$srcdir/ocaml.doc" + mv "$pkgdir"/usr/lib/ocaml "$srcdir"/ocaml.lib + mv "$pkgdir"/usr/share/doc/llvm/ocaml-html "$srcdir"/ocaml.doc if [[ $CARCH == x86_64 ]]; then # Needed for multilib (https://bugs.archlinux.org/task/29951) # Header stub is taken from Fedora - mv "$pkgdir/usr/include/llvm/Config/llvm-config"{,-64}.h - cp "$srcdir/llvm-config.h" "$pkgdir/usr/include/llvm/Config/llvm-config.h" + mv "$pkgdir"/usr/include/llvm/Config/llvm-config{,-64}.h + cp "$srcdir"/llvm-config.h "$pkgdir"/usr/include/llvm/Config/llvm-config.h fi - install -Dm644 ../LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir"/llvm-project/llvm/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE } package_llvm-libs-lw-git() { pkgdesc="LLVM runtime libraries" depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses' 'libxml2') - provides=('llvm-libs' 'llvm-libs-svn') + provides=('llvm-libs-git') install -d "$pkgdir/usr/lib" cp -P \ "$srcdir"/lib{LLVM,LTO}*.so* \ - "$srcdir"/LLVMgold.so \ - "$pkgdir/usr/lib/" - - # Symlink LLVMgold.so from /usr/lib/bfd-plugins - # https://bugs.archlinux.org/task/28479 - install -d "$pkgdir/usr/lib/bfd-plugins" - ln -s ../LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + "$pkgdir"/usr/lib/ - install -Dm644 "$srcdir/llvm-project/llvm/LICENSE.TXT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir"/llvm-project/llvm/LICENSE.TXT \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } package_llvm-ocaml-lw-git() { pkgdesc="OCaml bindings for LLVM" depends=('llvm' "ocaml=$_ocaml_ver" 'ocaml-ctypes') - provides=('llvm-ocaml' 'llvm-ocaml-svn') + conflicts=('llvm-ocaml') + provides=('llvm-ocaml-git') install -d "$pkgdir"/{usr/lib,usr/share/doc/$pkgname} - cp -a "$srcdir/ocaml.lib" "$pkgdir/usr/lib/ocaml" - cp -a "$srcdir/ocaml.doc" "$pkgdir/usr/share/doc/$pkgname/html" + cp -a "$srcdir"/ocaml.lib "$pkgdir"/usr/lib/ocaml + cp -a "$srcdir"/ocaml.doc "$pkgdir"/usr/share/doc/$pkgname/html - install -Dm644 "$srcdir/llvm-project/llvm/LICENSE.TXT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir"/llvm-project/llvm/LICENSE.TXT \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } # vim:set ts=2 sw=2 et: |