[arch-commits] Commit in llvm/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Jun 24 04:45:58 UTC 2017
Date: Saturday, June 24, 2017 @ 04:45:57
Author: foutrelis
Revision: 299183
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
llvm/repos/testing-i686/
llvm/repos/testing-i686/PKGBUILD
(from rev 299182, llvm/trunk/PKGBUILD)
llvm/repos/testing-i686/lldb-gcc7.patch
(from rev 299182, llvm/trunk/lldb-gcc7.patch)
llvm/repos/testing-i686/lldb-libedit.patch
(from rev 299182, llvm/trunk/lldb-libedit.patch)
llvm/repos/testing-i686/llvm-config.h
(from rev 299182, llvm/trunk/llvm-config.h)
llvm/repos/testing-x86_64/
llvm/repos/testing-x86_64/PKGBUILD
(from rev 299182, llvm/trunk/PKGBUILD)
llvm/repos/testing-x86_64/lldb-gcc7.patch
(from rev 299182, llvm/trunk/lldb-gcc7.patch)
llvm/repos/testing-x86_64/lldb-libedit.patch
(from rev 299182, llvm/trunk/lldb-libedit.patch)
llvm/repos/testing-x86_64/llvm-config.h
(from rev 299182, llvm/trunk/llvm-config.h)
-----------------------------------+
testing-i686/PKGBUILD | 261 ++++++++++++++++++++++++++++++++++++
testing-i686/lldb-gcc7.patch | 12 +
testing-i686/lldb-libedit.patch | 98 +++++++++++++
testing-i686/llvm-config.h | 9 +
testing-x86_64/PKGBUILD | 261 ++++++++++++++++++++++++++++++++++++
testing-x86_64/lldb-gcc7.patch | 12 +
testing-x86_64/lldb-libedit.patch | 98 +++++++++++++
testing-x86_64/llvm-config.h | 9 +
8 files changed, 760 insertions(+)
Copied: llvm/repos/testing-i686/PKGBUILD (from rev 299182, llvm/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,261 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Sebastian Nowicki <sebnow at gmail.com>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at aur.archlinux.org>
+# Contributor: Tomas Lindquist Olsen <tomas at famolsen.dk>
+# Contributor: Roberto Alsina <ralsina at kde.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
+
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lld' 'lldb' 'clang' 'clang-tools-extra')
+pkgver=4.0.1
+pkgrel=1
+_ocaml_ver=4.04.1
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('cmake' 'libffi' 'python2' "ocaml=$_ocaml_ver" 'python-sphinx'
+ 'ocaml-ctypes' 'ocaml-findlib' 'libedit' 'swig')
+# Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911)
+makedepends_x86_64=('gcc-multilib')
+options=('staticlibs')
+source=(http://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/lld-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
+ lldb-gcc7.patch
+ lldb-libedit.patch
+ llvm-config.h)
+sha256sums=('da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51'
+ 'SKIP'
+ '61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b'
+ 'SKIP'
+ '35d1e64efc108076acbe7392566a52c35df9ec19778eb9eb12245fc7d8b915b6'
+ 'SKIP'
+ 'a3c87794334887b93b7a766c507244a7cdcce1d48b2e9249fc9a94f2c3beb440'
+ 'SKIP'
+ '63ce10e533276ca353941ce5ab5cc8e8dcd99dbdd9c4fa49f344a212f29d36ed'
+ 'SKIP'
+ '8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b'
+ 'SKIP'
+ '10cca2f593c711b1b547f479f9f783ab88f9a64b356519d9aa1367e0ff6da73a'
+ 'b80bda6dc26792e499b3150e13c3017be4a65280b4b9f5c9f4c07b55a46d93b6'
+ '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
+ '11E521D646982372EB577A1F8F0871F202119294')
+
+prepare() {
+ cd "$srcdir/llvm-$pkgver.src"
+
+ mv "$srcdir/cfe-$pkgver.src" tools/clang
+ mv "$srcdir/clang-tools-extra-$pkgver.src" tools/clang/tools/extra
+ mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+ mv "$srcdir/lld-$pkgver.src" tools/lld
+ mv "$srcdir/lldb-$pkgver.src" tools/lldb
+
+ patch -Np0 -d tools/lldb <../lldb-gcc7.patch
+ patch -Np1 -d tools/lldb <../lldb-libedit.patch
+
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/llvm-$pkgver.src/build"
+
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -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 \
+ ..
+
+ make
+ make ocaml_doc
+
+ # Disable automatic installation of components that go into subpackages
+ sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
+ sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
+ sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
+}
+
+check() {
+ cd "$srcdir/llvm-$pkgver.src/build"
+ make check-{llvm,clang,clang-tools,lld}
+}
+
+package_llvm() {
+ pkgdesc="Low Level Virtual Machine"
+ depends=('llvm-libs' 'perl')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/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"
+
+ # 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/$pkgname/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"
+ fi
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-libs() {
+ pkgdesc="Low Level Virtual Machine (runtime libraries)"
+ depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses')
+
+ 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"
+
+ install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-ocaml() {
+ pkgdesc="OCaml bindings for LLVM"
+ depends=('llvm' "ocaml=$_ocaml_ver" 'ocaml-ctypes')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ 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"
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_lld() {
+ pkgdesc="Linker from the LLVM project"
+ url="http://lld.llvm.org/"
+ depends=('llvm-libs')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/lld DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_lldb() {
+ pkgdesc="Next generation, high-performance debugger"
+ url="http://lldb.llvm.org/"
+ depends=('llvm-libs' 'libxml2' 'python2' 'python2-six')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/lldb DESTDIR="$pkgdir" install
+
+ # https://bugs.archlinux.org/task/50759
+ sed -i "/import_module('_lldb')/s/_lldb/lldb.&/" \
+ "$pkgdir/usr/lib/python2.7/site-packages/lldb/__init__.py"
+
+ # Remove bundled six library
+ rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
+
+ # Compile Python scripts
+ python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"
+ python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang() {
+ pkgdesc="C language family frontend for LLVM"
+ url="http://clang.llvm.org/"
+ depends=('llvm-libs' 'gcc' 'libxml2')
+ optdepends=('openmp: OpenMP support in clang with -fopenmp'
+ 'python2: for scan-view and git-clang-format')
+ provides=("clang-analyzer=$pkgver")
+ conflicts=('clang-analyzer')
+ replaces=('clang-analyzer')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/clang DESTDIR="$pkgdir" install
+ make -C build/projects/compiler-rt DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}
+
+ # Move analyzer scripts out of /usr/libexec
+ mv "$pkgdir"/usr/libexec/{ccc,c++}-analyzer "$pkgdir/usr/lib/clang/"
+ rmdir "$pkgdir/usr/libexec"
+ sed -i 's|libexec|lib/clang|' "$pkgdir/usr/bin/scan-build"
+
+ # Install Python bindings
+ install -d "$pkgdir/usr/lib/python2.7/site-packages"
+ cp -a tools/clang/bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/"
+
+ # Use Python 2
+ sed -i 's|/usr/bin/env python|&2|' \
+ "$pkgdir/usr/bin/scan-view" \
+ "$pkgdir/usr/bin/git-clang-format" \
+ "$pkgdir/usr/share/$pkgname/clang-format-diff.py"
+
+ # Compile Python scripts
+ python2 -m compileall "$pkgdir"
+ python2 -O -m compileall "$pkgdir"
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang-tools-extra() {
+ pkgdesc="Extra tools built using clang's tooling APIs"
+ url="http://clang.llvm.org/"
+ depends=('clang')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/clang/tools/extra DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/clang-tools/html/{_sources,.buildinfo}
+
+ # Use Python 2
+ sed -i 's|/usr/bin/env python|&2|' \
+ "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy,run-find-all-symbols}.py
+
+ install -Dm644 tools/clang/tools/extra/LICENSE.TXT \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: llvm/repos/testing-i686/lldb-gcc7.patch (from rev 299182, llvm/trunk/lldb-gcc7.patch)
===================================================================
--- testing-i686/lldb-gcc7.patch (rev 0)
+++ testing-i686/lldb-gcc7.patch 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,12 @@
+Index: include/lldb/Utility/TaskPool.h
+===================================================================
+--- include/lldb/Utility/TaskPool.h
++++ include/lldb/Utility/TaskPool.h
+@@ -12,6 +12,7 @@
+
+ #include <cassert>
+ #include <cstdint>
++#include <functional>
+ #include <future>
+ #include <list>
+ #include <queue>
Copied: llvm/repos/testing-i686/lldb-libedit.patch (from rev 299182, llvm/trunk/lldb-libedit.patch)
===================================================================
--- testing-i686/lldb-libedit.patch (rev 0)
+++ testing-i686/lldb-libedit.patch 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,98 @@
+From 9ad9480c3a380a04b3dbe869c0675d6bba37247b Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <n54 at gmx.com>
+Date: Thu, 25 May 2017 20:12:30 +0000
+Subject: [PATCH] Fix bug #28898 lldb: libedit produces garbled, unusable input
+ on Linux
+
+Apply patch from Christos Zoulas, upstream libedit developer.
+It has been tested on NetBSD/amd64.
+
+New code supports combination of wide libedit and disabled
+LLDB_EDITLINE_USE_WCHAR, which was the popular case on Linux
+systems.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@303907 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/lldb/Host/Editline.h | 12 +++++++++---
+ source/Host/common/Editline.cpp | 8 ++++----
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
+index 2b1a8e0..0b75e9c 100644
+--- a/include/lldb/Host/Editline.h
++++ b/include/lldb/Host/Editline.h
+@@ -82,8 +82,14 @@ using EditLineStringStreamType = std::stringstream;
+ using EditLineCharType = char;
+ #endif
+
++#ifdef EL_CLIENTDATA /* editline with wide support + wide char read function */
++using EditLineGetCharType = wchar_t;
++#else
++using EditLineGetCharType = char;
++#endif
++
+ typedef int (*EditlineGetCharCallbackType)(::EditLine *editline,
+- EditLineCharType *c);
++ EditLineGetCharType *c);
+ typedef unsigned char (*EditlineCommandCallbackType)(::EditLine *editline,
+ int ch);
+ typedef const char *(*EditlinePromptCallbackType)(::EditLine *editline);
+@@ -270,7 +276,7 @@ private:
+
+ /// Character reading implementation for EditLine that supports our multi-line
+ /// editing trickery.
+- int GetCharacter(EditLineCharType *c);
++ int GetCharacter(EditLineGetCharType *c);
+
+ /// Prompt implementation for EditLine.
+ const char *Prompt();
+@@ -323,7 +329,7 @@ private:
+ /// single or multi-line editing.
+ void ConfigureEditor(bool multiline);
+
+- bool CompleteCharacter(char ch, EditLineCharType &out);
++ bool CompleteCharacter(char ch, EditLineGetCharType &out);
+
+ private:
+ #if LLDB_EDITLINE_USE_WCHAR
+diff --git a/source/Host/common/Editline.cpp b/source/Host/common/Editline.cpp
+index 7d4b398..7b580dd 100644
+--- a/source/Host/common/Editline.cpp
++++ b/source/Host/common/Editline.cpp
+@@ -474,7 +474,7 @@ unsigned char Editline::RecallHistory(bool earlier) {
+ return CC_NEWLINE;
+ }
+
+-int Editline::GetCharacter(EditLineCharType *c) {
++int Editline::GetCharacter(EditLineGetCharType *c) {
+ const LineInfoW *info = el_wline(m_editline);
+
+ // Paint a faint version of the desired prompt over the version libedit draws
+@@ -969,7 +969,7 @@ void Editline::ConfigureEditor(bool multiline) {
+ }));
+
+ el_wset(m_editline, EL_GETCFN, (EditlineGetCharCallbackType)([](
+- EditLine *editline, EditLineCharType *c) {
++ EditLine *editline, EditLineGetCharType *c) {
+ return Editline::InstanceFor(editline)->GetCharacter(c);
+ }));
+
+@@ -1360,12 +1360,12 @@ void Editline::PrintAsync(Stream *stream, const char *s, size_t len) {
+ }
+ }
+
+-bool Editline::CompleteCharacter(char ch, EditLineCharType &out) {
++bool Editline::CompleteCharacter(char ch, EditLineGetCharType &out) {
+ #if !LLDB_EDITLINE_USE_WCHAR
+ if (ch == (char)EOF)
+ return false;
+
+- out = ch;
++ out = (unsigned char)ch;
+ return true;
+ #else
+ std::codecvt_utf8<wchar_t> cvt;
+--
+2.13.0
+
Copied: llvm/repos/testing-i686/llvm-config.h (from rev 299182, llvm/trunk/llvm-config.h)
===================================================================
--- testing-i686/llvm-config.h (rev 0)
+++ testing-i686/llvm-config.h 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
Copied: llvm/repos/testing-x86_64/PKGBUILD (from rev 299182, llvm/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,261 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Sebastian Nowicki <sebnow at gmail.com>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at aur.archlinux.org>
+# Contributor: Tomas Lindquist Olsen <tomas at famolsen.dk>
+# Contributor: Roberto Alsina <ralsina at kde.org>
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
+
+pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'lld' 'lldb' 'clang' 'clang-tools-extra')
+pkgver=4.0.1
+pkgrel=1
+_ocaml_ver=4.04.1
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('cmake' 'libffi' 'python2' "ocaml=$_ocaml_ver" 'python-sphinx'
+ 'ocaml-ctypes' 'ocaml-findlib' 'libedit' 'swig')
+# Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911)
+makedepends_x86_64=('gcc-multilib')
+options=('staticlibs')
+source=(http://releases.llvm.org/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/clang-tools-extra-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/lld-$pkgver.src.tar.xz{,.sig}
+ http://releases.llvm.org/$pkgver/lldb-$pkgver.src.tar.xz{,.sig}
+ lldb-gcc7.patch
+ lldb-libedit.patch
+ llvm-config.h)
+sha256sums=('da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51'
+ 'SKIP'
+ '61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b'
+ 'SKIP'
+ '35d1e64efc108076acbe7392566a52c35df9ec19778eb9eb12245fc7d8b915b6'
+ 'SKIP'
+ 'a3c87794334887b93b7a766c507244a7cdcce1d48b2e9249fc9a94f2c3beb440'
+ 'SKIP'
+ '63ce10e533276ca353941ce5ab5cc8e8dcd99dbdd9c4fa49f344a212f29d36ed'
+ 'SKIP'
+ '8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b'
+ 'SKIP'
+ '10cca2f593c711b1b547f479f9f783ab88f9a64b356519d9aa1367e0ff6da73a'
+ 'b80bda6dc26792e499b3150e13c3017be4a65280b4b9f5c9f4c07b55a46d93b6'
+ '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D'
+ '11E521D646982372EB577A1F8F0871F202119294')
+
+prepare() {
+ cd "$srcdir/llvm-$pkgver.src"
+
+ mv "$srcdir/cfe-$pkgver.src" tools/clang
+ mv "$srcdir/clang-tools-extra-$pkgver.src" tools/clang/tools/extra
+ mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+ mv "$srcdir/lld-$pkgver.src" tools/lld
+ mv "$srcdir/lldb-$pkgver.src" tools/lldb
+
+ patch -Np0 -d tools/lldb <../lldb-gcc7.patch
+ patch -Np1 -d tools/lldb <../lldb-libedit.patch
+
+ mkdir build
+}
+
+build() {
+ cd "$srcdir/llvm-$pkgver.src/build"
+
+ cmake \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -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 \
+ ..
+
+ make
+ make ocaml_doc
+
+ # Disable automatic installation of components that go into subpackages
+ sed -i '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake
+ sed -i '/extra\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
+ sed -i '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
+}
+
+check() {
+ cd "$srcdir/llvm-$pkgver.src/build"
+ make check-{llvm,clang,clang-tools,lld}
+}
+
+package_llvm() {
+ pkgdesc="Low Level Virtual Machine"
+ depends=('llvm-libs' 'perl')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/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"
+
+ # 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/$pkgname/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"
+ fi
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-libs() {
+ pkgdesc="Low Level Virtual Machine (runtime libraries)"
+ depends=('gcc-libs' 'zlib' 'libffi' 'libedit' 'ncurses')
+
+ 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"
+
+ install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-ocaml() {
+ pkgdesc="OCaml bindings for LLVM"
+ depends=('llvm' "ocaml=$_ocaml_ver" 'ocaml-ctypes')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ 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"
+
+ install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_lld() {
+ pkgdesc="Linker from the LLVM project"
+ url="http://lld.llvm.org/"
+ depends=('llvm-libs')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/lld DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_lldb() {
+ pkgdesc="Next generation, high-performance debugger"
+ url="http://lldb.llvm.org/"
+ depends=('llvm-libs' 'libxml2' 'python2' 'python2-six')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/lldb DESTDIR="$pkgdir" install
+
+ # https://bugs.archlinux.org/task/50759
+ sed -i "/import_module('_lldb')/s/_lldb/lldb.&/" \
+ "$pkgdir/usr/lib/python2.7/site-packages/lldb/__init__.py"
+
+ # Remove bundled six library
+ rm "$pkgdir/usr/lib/python2.7/site-packages/six.py"
+
+ # Compile Python scripts
+ python2 -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"
+ python2 -O -m compileall "$pkgdir/usr/lib/python2.7/site-packages/lldb"
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang() {
+ pkgdesc="C language family frontend for LLVM"
+ url="http://clang.llvm.org/"
+ depends=('llvm-libs' 'gcc' 'libxml2')
+ optdepends=('openmp: OpenMP support in clang with -fopenmp'
+ 'python2: for scan-view and git-clang-format')
+ provides=("clang-analyzer=$pkgver")
+ conflicts=('clang-analyzer')
+ replaces=('clang-analyzer')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/clang DESTDIR="$pkgdir" install
+ make -C build/projects/compiler-rt DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/$pkgname/html/{_sources,.buildinfo}
+
+ # Move analyzer scripts out of /usr/libexec
+ mv "$pkgdir"/usr/libexec/{ccc,c++}-analyzer "$pkgdir/usr/lib/clang/"
+ rmdir "$pkgdir/usr/libexec"
+ sed -i 's|libexec|lib/clang|' "$pkgdir/usr/bin/scan-build"
+
+ # Install Python bindings
+ install -d "$pkgdir/usr/lib/python2.7/site-packages"
+ cp -a tools/clang/bindings/python/clang "$pkgdir/usr/lib/python2.7/site-packages/"
+
+ # Use Python 2
+ sed -i 's|/usr/bin/env python|&2|' \
+ "$pkgdir/usr/bin/scan-view" \
+ "$pkgdir/usr/bin/git-clang-format" \
+ "$pkgdir/usr/share/$pkgname/clang-format-diff.py"
+
+ # Compile Python scripts
+ python2 -m compileall "$pkgdir"
+ python2 -O -m compileall "$pkgdir"
+
+ install -Dm644 tools/$pkgname/LICENSE.TXT \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang-tools-extra() {
+ pkgdesc="Extra tools built using clang's tooling APIs"
+ url="http://clang.llvm.org/"
+ depends=('clang')
+
+ cd "$srcdir/llvm-$pkgver.src"
+
+ make -C build/tools/clang/tools/extra DESTDIR="$pkgdir" install
+
+ # Remove documentation sources
+ rm -r "$pkgdir"/usr/share/doc/clang-tools/html/{_sources,.buildinfo}
+
+ # Use Python 2
+ sed -i 's|/usr/bin/env python|&2|' \
+ "$pkgdir"/usr/share/clang/{clang-tidy-diff,run-clang-tidy,run-find-all-symbols}.py
+
+ install -Dm644 tools/clang/tools/extra/LICENSE.TXT \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: llvm/repos/testing-x86_64/lldb-gcc7.patch (from rev 299182, llvm/trunk/lldb-gcc7.patch)
===================================================================
--- testing-x86_64/lldb-gcc7.patch (rev 0)
+++ testing-x86_64/lldb-gcc7.patch 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,12 @@
+Index: include/lldb/Utility/TaskPool.h
+===================================================================
+--- include/lldb/Utility/TaskPool.h
++++ include/lldb/Utility/TaskPool.h
+@@ -12,6 +12,7 @@
+
+ #include <cassert>
+ #include <cstdint>
++#include <functional>
+ #include <future>
+ #include <list>
+ #include <queue>
Copied: llvm/repos/testing-x86_64/lldb-libedit.patch (from rev 299182, llvm/trunk/lldb-libedit.patch)
===================================================================
--- testing-x86_64/lldb-libedit.patch (rev 0)
+++ testing-x86_64/lldb-libedit.patch 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,98 @@
+From 9ad9480c3a380a04b3dbe869c0675d6bba37247b Mon Sep 17 00:00:00 2001
+From: Kamil Rytarowski <n54 at gmx.com>
+Date: Thu, 25 May 2017 20:12:30 +0000
+Subject: [PATCH] Fix bug #28898 lldb: libedit produces garbled, unusable input
+ on Linux
+
+Apply patch from Christos Zoulas, upstream libedit developer.
+It has been tested on NetBSD/amd64.
+
+New code supports combination of wide libedit and disabled
+LLDB_EDITLINE_USE_WCHAR, which was the popular case on Linux
+systems.
+
+
+git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@303907 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ include/lldb/Host/Editline.h | 12 +++++++++---
+ source/Host/common/Editline.cpp | 8 ++++----
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
+index 2b1a8e0..0b75e9c 100644
+--- a/include/lldb/Host/Editline.h
++++ b/include/lldb/Host/Editline.h
+@@ -82,8 +82,14 @@ using EditLineStringStreamType = std::stringstream;
+ using EditLineCharType = char;
+ #endif
+
++#ifdef EL_CLIENTDATA /* editline with wide support + wide char read function */
++using EditLineGetCharType = wchar_t;
++#else
++using EditLineGetCharType = char;
++#endif
++
+ typedef int (*EditlineGetCharCallbackType)(::EditLine *editline,
+- EditLineCharType *c);
++ EditLineGetCharType *c);
+ typedef unsigned char (*EditlineCommandCallbackType)(::EditLine *editline,
+ int ch);
+ typedef const char *(*EditlinePromptCallbackType)(::EditLine *editline);
+@@ -270,7 +276,7 @@ private:
+
+ /// Character reading implementation for EditLine that supports our multi-line
+ /// editing trickery.
+- int GetCharacter(EditLineCharType *c);
++ int GetCharacter(EditLineGetCharType *c);
+
+ /// Prompt implementation for EditLine.
+ const char *Prompt();
+@@ -323,7 +329,7 @@ private:
+ /// single or multi-line editing.
+ void ConfigureEditor(bool multiline);
+
+- bool CompleteCharacter(char ch, EditLineCharType &out);
++ bool CompleteCharacter(char ch, EditLineGetCharType &out);
+
+ private:
+ #if LLDB_EDITLINE_USE_WCHAR
+diff --git a/source/Host/common/Editline.cpp b/source/Host/common/Editline.cpp
+index 7d4b398..7b580dd 100644
+--- a/source/Host/common/Editline.cpp
++++ b/source/Host/common/Editline.cpp
+@@ -474,7 +474,7 @@ unsigned char Editline::RecallHistory(bool earlier) {
+ return CC_NEWLINE;
+ }
+
+-int Editline::GetCharacter(EditLineCharType *c) {
++int Editline::GetCharacter(EditLineGetCharType *c) {
+ const LineInfoW *info = el_wline(m_editline);
+
+ // Paint a faint version of the desired prompt over the version libedit draws
+@@ -969,7 +969,7 @@ void Editline::ConfigureEditor(bool multiline) {
+ }));
+
+ el_wset(m_editline, EL_GETCFN, (EditlineGetCharCallbackType)([](
+- EditLine *editline, EditLineCharType *c) {
++ EditLine *editline, EditLineGetCharType *c) {
+ return Editline::InstanceFor(editline)->GetCharacter(c);
+ }));
+
+@@ -1360,12 +1360,12 @@ void Editline::PrintAsync(Stream *stream, const char *s, size_t len) {
+ }
+ }
+
+-bool Editline::CompleteCharacter(char ch, EditLineCharType &out) {
++bool Editline::CompleteCharacter(char ch, EditLineGetCharType &out) {
+ #if !LLDB_EDITLINE_USE_WCHAR
+ if (ch == (char)EOF)
+ return false;
+
+- out = ch;
++ out = (unsigned char)ch;
+ return true;
+ #else
+ std::codecvt_utf8<wchar_t> cvt;
+--
+2.13.0
+
Copied: llvm/repos/testing-x86_64/llvm-config.h (from rev 299182, llvm/trunk/llvm-config.h)
===================================================================
--- testing-x86_64/llvm-config.h (rev 0)
+++ testing-x86_64/llvm-config.h 2017-06-24 04:45:57 UTC (rev 299183)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
More information about the arch-commits
mailing list