[arch-commits] Commit in llvm35/repos (12 files)

Evangelos Foutras foutrelis at archlinux.org
Mon Sep 7 15:05:34 UTC 2015 

    Date: Monday, September 7, 2015 @ 17:05:34
  Author: foutrelis
Revision: 245469

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  llvm35/repos/staging-i686/
  llvm35/repos/staging-i686/PKGBUILD
    (from rev 245468, llvm35/trunk/PKGBUILD)
  llvm35/repos/staging-i686/gcc5.patch
    (from rev 245468, llvm35/trunk/gcc5.patch)
  llvm35/repos/staging-i686/llvm-3.5.0-force-link-pass.o.patch
    (from rev 245468, llvm35/trunk/llvm-3.5.0-force-link-pass.o.patch)
  llvm35/repos/staging-i686/llvm-Config-config.h
    (from rev 245468, llvm35/trunk/llvm-Config-config.h)
  llvm35/repos/staging-i686/llvm-Config-llvm-config.h
    (from rev 245468, llvm35/trunk/llvm-Config-llvm-config.h)
  llvm35/repos/staging-x86_64/
  llvm35/repos/staging-x86_64/PKGBUILD
    (from rev 245468, llvm35/trunk/PKGBUILD)
  llvm35/repos/staging-x86_64/gcc5.patch
    (from rev 245468, llvm35/trunk/gcc5.patch)
  llvm35/repos/staging-x86_64/llvm-3.5.0-force-link-pass.o.patch
    (from rev 245468, llvm35/trunk/llvm-3.5.0-force-link-pass.o.patch)
  llvm35/repos/staging-x86_64/llvm-Config-config.h
    (from rev 245468, llvm35/trunk/llvm-Config-config.h)
  llvm35/repos/staging-x86_64/llvm-Config-llvm-config.h
    (from rev 245468, llvm35/trunk/llvm-Config-llvm-config.h)

---------------------------------------------------+
 staging-i686/PKGBUILD                             |  187 ++++++++++++++++++++
 staging-i686/gcc5.patch                           |   14 +
 staging-i686/llvm-3.5.0-force-link-pass.o.patch   |   28 ++
 staging-i686/llvm-Config-config.h                 |    9 
 staging-i686/llvm-Config-llvm-config.h            |    9 
 staging-x86_64/PKGBUILD                           |  187 ++++++++++++++++++++
 staging-x86_64/gcc5.patch                         |   14 +
 staging-x86_64/llvm-3.5.0-force-link-pass.o.patch |   28 ++
 staging-x86_64/llvm-Config-config.h               |    9 
 staging-x86_64/llvm-Config-llvm-config.h          |    9 
 10 files changed, 494 insertions(+)

Copied: llvm35/repos/staging-i686/PKGBUILD (from rev 245468, llvm35/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,187 @@
+# $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>
+
+# These packages are meant to be used for compiling packages that haven't been
+# ported to LLVM 3.6 yet. Such packages may depend on llvm35-libs but not on
+# llvm35 or clang35 which aren't co-installable with the LLVM 3.6 packages.
+
+pkgname=('llvm35' 'llvm35-libs' 'clang35')
+pkgver=3.5.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('libffi' 'python2' 'python-sphinx')
+# Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911)
+makedepends_x86_64=('gcc-multilib')
+options=('staticlibs')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
+        llvm-3.5.0-force-link-pass.o.patch
+        gcc5.patch
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h)
+sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
+            'SKIP'
+            '4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620'
+            'SKIP'
+            '542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3'
+            'SKIP'
+            '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19'
+            'c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294')
+
+prepare() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # At the present, clang must reside inside the LLVM source code tree to build
+  # See http://llvm.org/bugs/show_bug.cgi?id=4840
+  mv "$srcdir/cfe-$pkgver.src" tools/clang
+
+  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+
+  # Fix docs installation directory
+  sed -i 's:$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+    Makefile.config.in
+
+  # Fix definition of LLVM_CMAKE_DIR in LLVMConfig.cmake
+  sed -i '/@LLVM_CONFIG_CMAKE_DIR@/s:$(PROJ_cmake):$(PROJ_prefix)/share/llvm/cmake:' \
+    cmake/modules/Makefile
+
+  # Fix build with GCC 4.9 (patch from Debian)
+  # http://llvm.org/bugs/show_bug.cgi?id=20067
+  patch -Np1 -i ../llvm-3.5.0-force-link-pass.o.patch
+
+  # Fix build with GCC 5.1
+  # http://llvm.org/viewvc/llvm-project?view=revision&revision=218295
+  patch -Np0 -i ../gcc5.patch
+}
+
+build() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # Include location of libffi headers in CPPFLAGS
+  CPPFLAGS+=" $(pkg-config --cflags libffi)"
+
+  # Force the use of GCC instead of clang
+  CC=gcc CXX=g++ \
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-optimized \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --with-python=/usr/bin/python2
+
+  make REQUIRES_RTTI=1
+  make -C docs -f Makefile.sphinx man
+  make -C docs -f Makefile.sphinx html
+  make -C tools/clang/docs -f Makefile.sphinx html
+}
+
+package_llvm35() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=("llvm35-libs=$pkgver-$pkgrel" 'perl')
+  conflicts=('llvm')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # We move the clang directory out of the tree so it won't get installed and
+  # then we bring it back in for the clang package
+  mv tools/clang "$srcdir"
+
+  make DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools/
+
+  # The runtime library goes into llvm35-libs
+  mv -f "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/"
+  mv -f "$pkgdir/usr/lib/libLLVM-${pkgver%.*}.so" "$srcdir/"
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/*LLVMHello.*
+
+  # Remove LTO libs which conflict with llvm-libs
+  rm "$pkgdir"/usr/lib/{LLVMgold,libLTO,BugpointPasses}.so
+
+  if [[ $CARCH == x86_64 ]]; then
+    # Needed for multilib (https://bugs.archlinux.org/task/29951)
+    # Header stubs are taken from Fedora
+    for _header in config llvm-config; do
+      mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h
+      cp "$srcdir/llvm-Config-$_header.h" \
+        "$pkgdir/usr/include/llvm/Config/$_header.h"
+    done
+  fi
+
+  # Install man pages
+  install -d "$pkgdir/usr/share/man/man1"
+  cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/"
+
+  # Install html docs
+  cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/"
+  rm -r "$pkgdir/usr/share/doc/llvm/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm35-libs() {
+  pkgdesc="Low Level Virtual Machine (runtime library)"
+  depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
+
+  install -d "$pkgdir/usr/lib"
+  cp -P \
+    "$srcdir/libLLVM-$pkgver.so" \
+    "$srcdir/libLLVM-${pkgver%.*}.so" \
+    "$pkgdir/usr/lib/"
+
+  install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang35() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  depends=("llvm35-libs=$pkgver-$pkgrel" 'gcc')
+  optdepends=('llvm-libs: for compiling with -flto')
+  conflicts=('clang')
+
+  # Fix installation path for clang docs
+  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Revert the path change in case we want to do a repackage later
+  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  # Install html docs
+  cp -r docs/_build/html/* "$pkgdir/usr/share/doc/clang/html/"
+  rm -r "$pkgdir/usr/share/doc/clang/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: llvm35/repos/staging-i686/gcc5.patch (from rev 245468, llvm35/trunk/gcc5.patch)
===================================================================
--- staging-i686/gcc5.patch	                        (rev 0)
+++ staging-i686/gcc5.patch	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,14 @@
+Index: include/llvm/ADT/IntrusiveRefCntPtr.h
+===================================================================
+--- include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218294)
++++ include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218295)
+@@ -197,6 +197,9 @@
+   private:
+     void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); }
+     void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); }
++
++    template <typename X>
++    friend class IntrusiveRefCntPtr;
+   };
+ 
+   template<class T, class U>

Copied: llvm35/repos/staging-i686/llvm-3.5.0-force-link-pass.o.patch (from rev 245468, llvm35/trunk/llvm-3.5.0-force-link-pass.o.patch)
===================================================================
--- staging-i686/llvm-3.5.0-force-link-pass.o.patch	                        (rev 0)
+++ staging-i686/llvm-3.5.0-force-link-pass.o.patch	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,28 @@
+Index: llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile
+===================================================================
+--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/bugpoint/Makefile
++++ llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile
+@@ -12,6 +12,9 @@ TOOLNAME := bugpoint
+ LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
+                    bitwriter irreader vectorize objcarcopts codegen
+ 
++# Crappy workaround to make sure it links correctly.
++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o
++
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 
+Index: llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile
+===================================================================
+--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/opt/Makefile
++++ llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile
+@@ -10,7 +10,9 @@
+ LEVEL := ../..
+ TOOLNAME := opt
+ LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen
++# Crappy workaround to make sure it links correctly.
+ 
++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 

Copied: llvm35/repos/staging-i686/llvm-Config-config.h (from rev 245468, llvm35/trunk/llvm-Config-config.h)
===================================================================
--- staging-i686/llvm-Config-config.h	                        (rev 0)
+++ staging-i686/llvm-Config-config.h	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif

Copied: llvm35/repos/staging-i686/llvm-Config-llvm-config.h (from rev 245468, llvm35/trunk/llvm-Config-llvm-config.h)
===================================================================
--- staging-i686/llvm-Config-llvm-config.h	                        (rev 0)
+++ staging-i686/llvm-Config-llvm-config.h	2015-09-07 15:05:34 UTC (rev 245469)
@@ -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: llvm35/repos/staging-x86_64/PKGBUILD (from rev 245468, llvm35/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,187 @@
+# $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>
+
+# These packages are meant to be used for compiling packages that haven't been
+# ported to LLVM 3.6 yet. Such packages may depend on llvm35-libs but not on
+# llvm35 or clang35 which aren't co-installable with the LLVM 3.6 packages.
+
+pkgname=('llvm35' 'llvm35-libs' 'clang35')
+pkgver=3.5.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('libffi' 'python2' 'python-sphinx')
+# Use gcc-multilib to build 32-bit compiler-rt libraries on x86_64 (FS#41911)
+makedepends_x86_64=('gcc-multilib')
+options=('staticlibs')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
+        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
+        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.xz{,.sig}
+        llvm-3.5.0-force-link-pass.o.patch
+        gcc5.patch
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h)
+sha256sums=('44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575'
+            'SKIP'
+            '4feb575f74fb3a74b6245400460230141bf610f235ef3a25008cfe6137828620'
+            'SKIP'
+            '542d7aadd21e7fe35bea0a7912bc965f08a1a566746cebcca76f96dcfeb74dc3'
+            'SKIP'
+            '5702053503d49448598eda1b8dc8c263f0df9ad7486833273e3987b5dec25a19'
+            'c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294')
+
+prepare() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # At the present, clang must reside inside the LLVM source code tree to build
+  # See http://llvm.org/bugs/show_bug.cgi?id=4840
+  mv "$srcdir/cfe-$pkgver.src" tools/clang
+
+  mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+
+  # Fix docs installation directory
+  sed -i 's:$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+    Makefile.config.in
+
+  # Fix definition of LLVM_CMAKE_DIR in LLVMConfig.cmake
+  sed -i '/@LLVM_CONFIG_CMAKE_DIR@/s:$(PROJ_cmake):$(PROJ_prefix)/share/llvm/cmake:' \
+    cmake/modules/Makefile
+
+  # Fix build with GCC 4.9 (patch from Debian)
+  # http://llvm.org/bugs/show_bug.cgi?id=20067
+  patch -Np1 -i ../llvm-3.5.0-force-link-pass.o.patch
+
+  # Fix build with GCC 5.1
+  # http://llvm.org/viewvc/llvm-project?view=revision&revision=218295
+  patch -Np0 -i ../gcc5.patch
+}
+
+build() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # Include location of libffi headers in CPPFLAGS
+  CPPFLAGS+=" $(pkg-config --cflags libffi)"
+
+  # Force the use of GCC instead of clang
+  CC=gcc CXX=g++ \
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --enable-shared \
+    --enable-optimized \
+    --enable-libffi \
+    --enable-targets=all \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --with-python=/usr/bin/python2
+
+  make REQUIRES_RTTI=1
+  make -C docs -f Makefile.sphinx man
+  make -C docs -f Makefile.sphinx html
+  make -C tools/clang/docs -f Makefile.sphinx html
+}
+
+package_llvm35() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=("llvm35-libs=$pkgver-$pkgrel" 'perl')
+  conflicts=('llvm')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # We move the clang directory out of the tree so it won't get installed and
+  # then we bring it back in for the clang package
+  mv tools/clang "$srcdir"
+
+  make DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools/
+
+  # The runtime library goes into llvm35-libs
+  mv -f "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/"
+  mv -f "$pkgdir/usr/lib/libLLVM-${pkgver%.*}.so" "$srcdir/"
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/*LLVMHello.*
+
+  # Remove LTO libs which conflict with llvm-libs
+  rm "$pkgdir"/usr/lib/{LLVMgold,libLTO,BugpointPasses}.so
+
+  if [[ $CARCH == x86_64 ]]; then
+    # Needed for multilib (https://bugs.archlinux.org/task/29951)
+    # Header stubs are taken from Fedora
+    for _header in config llvm-config; do
+      mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h
+      cp "$srcdir/llvm-Config-$_header.h" \
+        "$pkgdir/usr/include/llvm/Config/$_header.h"
+    done
+  fi
+
+  # Install man pages
+  install -d "$pkgdir/usr/share/man/man1"
+  cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/"
+
+  # Install html docs
+  cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/"
+  rm -r "$pkgdir/usr/share/doc/llvm/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm35-libs() {
+  pkgdesc="Low Level Virtual Machine (runtime library)"
+  depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
+
+  install -d "$pkgdir/usr/lib"
+  cp -P \
+    "$srcdir/libLLVM-$pkgver.so" \
+    "$srcdir/libLLVM-${pkgver%.*}.so" \
+    "$pkgdir/usr/lib/"
+
+  install -Dm644 "$srcdir/llvm-$pkgver.src/LICENSE.TXT" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_clang35() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  depends=("llvm35-libs=$pkgver-$pkgrel" 'gcc')
+  optdepends=('llvm-libs: for compiling with -flto')
+  conflicts=('clang')
+
+  # Fix installation path for clang docs
+  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+
+  make DESTDIR="$pkgdir" install
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Revert the path change in case we want to do a repackage later
+  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
+    "$srcdir/llvm-$pkgver.src/Makefile.config"
+
+  # Install html docs
+  cp -r docs/_build/html/* "$pkgdir/usr/share/doc/clang/html/"
+  rm -r "$pkgdir/usr/share/doc/clang/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: llvm35/repos/staging-x86_64/gcc5.patch (from rev 245468, llvm35/trunk/gcc5.patch)
===================================================================
--- staging-x86_64/gcc5.patch	                        (rev 0)
+++ staging-x86_64/gcc5.patch	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,14 @@
+Index: include/llvm/ADT/IntrusiveRefCntPtr.h
+===================================================================
+--- include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218294)
++++ include/llvm/ADT/IntrusiveRefCntPtr.h	(revision 218295)
+@@ -197,6 +197,9 @@
+   private:
+     void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); }
+     void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); }
++
++    template <typename X>
++    friend class IntrusiveRefCntPtr;
+   };
+ 
+   template<class T, class U>

Copied: llvm35/repos/staging-x86_64/llvm-3.5.0-force-link-pass.o.patch (from rev 245468, llvm35/trunk/llvm-3.5.0-force-link-pass.o.patch)
===================================================================
--- staging-x86_64/llvm-3.5.0-force-link-pass.o.patch	                        (rev 0)
+++ staging-x86_64/llvm-3.5.0-force-link-pass.o.patch	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,28 @@
+Index: llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile
+===================================================================
+--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/bugpoint/Makefile
++++ llvm-toolchain-snapshot-3.5~svn211313/tools/bugpoint/Makefile
+@@ -12,6 +12,9 @@ TOOLNAME := bugpoint
+ LINK_COMPONENTS := asmparser instrumentation scalaropts ipo linker bitreader \
+                    bitwriter irreader vectorize objcarcopts codegen
+ 
++# Crappy workaround to make sure it links correctly.
++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o
++
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 
+Index: llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile
+===================================================================
+--- llvm-toolchain-snapshot-3.5~svn211313.orig/tools/opt/Makefile
++++ llvm-toolchain-snapshot-3.5~svn211313/tools/opt/Makefile
+@@ -10,7 +10,9 @@
+ LEVEL := ../..
+ TOOLNAME := opt
+ LINK_COMPONENTS := bitreader bitwriter asmparser irreader instrumentation scalaropts objcarcopts ipo vectorize all-targets codegen
++# Crappy workaround to make sure it links correctly.
+ 
++LLVMLibsOptions := ../../lib/IR/Release*/Pass.o
+ # Support plugins.
+ NO_DEAD_STRIP := 1
+ 

Copied: llvm35/repos/staging-x86_64/llvm-Config-config.h (from rev 245468, llvm35/trunk/llvm-Config-config.h)
===================================================================
--- staging-x86_64/llvm-Config-config.h	                        (rev 0)
+++ staging-x86_64/llvm-Config-config.h	2015-09-07 15:05:34 UTC (rev 245469)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif

Copied: llvm35/repos/staging-x86_64/llvm-Config-llvm-config.h (from rev 245468, llvm35/trunk/llvm-Config-llvm-config.h)
===================================================================
--- staging-x86_64/llvm-Config-llvm-config.h	                        (rev 0)
+++ staging-x86_64/llvm-Config-llvm-config.h	2015-09-07 15:05:34 UTC (rev 245469)
@@ -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