[arch-commits] Commit in llvm/repos (16 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Mon Oct 21 14:52:40 UTC 2013


    Date: Monday, October 21, 2013 @ 16:52:40
  Author: foutrelis
Revision: 197048

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

Added:
  llvm/repos/extra-i686/PKGBUILD
    (from rev 197047, llvm/trunk/PKGBUILD)
  llvm/repos/extra-i686/clang-3.3-use-gold-linker.patch
    (from rev 197047, llvm/trunk/clang-3.3-use-gold-linker.patch)
  llvm/repos/extra-i686/llvm-Config-config.h
    (from rev 197047, llvm/trunk/llvm-Config-config.h)
  llvm/repos/extra-i686/llvm-Config-llvm-config.h
    (from rev 197047, llvm/trunk/llvm-Config-llvm-config.h)
  llvm/repos/extra-x86_64/PKGBUILD
    (from rev 197047, llvm/trunk/PKGBUILD)
  llvm/repos/extra-x86_64/clang-3.3-use-gold-linker.patch
    (from rev 197047, llvm/trunk/clang-3.3-use-gold-linker.patch)
  llvm/repos/extra-x86_64/llvm-Config-config.h
    (from rev 197047, llvm/trunk/llvm-Config-config.h)
  llvm/repos/extra-x86_64/llvm-Config-llvm-config.h
    (from rev 197047, llvm/trunk/llvm-Config-llvm-config.h)
Deleted:
  llvm/repos/extra-i686/PKGBUILD
  llvm/repos/extra-i686/clang-3.3-use-gold-linker.patch
  llvm/repos/extra-i686/llvm-Config-config.h
  llvm/repos/extra-i686/llvm-Config-llvm-config.h
  llvm/repos/extra-x86_64/PKGBUILD
  llvm/repos/extra-x86_64/clang-3.3-use-gold-linker.patch
  llvm/repos/extra-x86_64/llvm-Config-config.h
  llvm/repos/extra-x86_64/llvm-Config-llvm-config.h

----------------------------------------------+
 /PKGBUILD                                    |  456 +++++++++++++++++++++++++
 /clang-3.3-use-gold-linker.patch             |   24 +
 /llvm-Config-config.h                        |   18 
 /llvm-Config-llvm-config.h                   |   18 
 extra-i686/PKGBUILD                          |  227 ------------
 extra-i686/clang-3.3-use-gold-linker.patch   |   12 
 extra-i686/llvm-Config-config.h              |    9 
 extra-i686/llvm-Config-llvm-config.h         |    9 
 extra-x86_64/PKGBUILD                        |  227 ------------
 extra-x86_64/clang-3.3-use-gold-linker.patch |   12 
 extra-x86_64/llvm-Config-config.h            |    9 
 extra-x86_64/llvm-Config-llvm-config.h       |    9 
 12 files changed, 516 insertions(+), 514 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-i686/PKGBUILD	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,227 +0,0 @@
-# $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' 'clang' 'clang-analyzer')
-pkgver=3.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
-        clang-3.3-use-gold-linker.patch
-        llvm-Config-config.h
-        llvm-Config-llvm-config.h)
-sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
-            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
-            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
-            '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
-            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
-            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
-
-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 insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Make -flto work; use ld.gold instead of the default linker
-  patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
-}
-
-build() {
-  cd "$srcdir/llvm-$pkgver.src"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # 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-libffi \
-    --enable-targets=all \
-    --enable-experimental-targets=R600 \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-python=/usr/bin/python2 \
-    --$_optimized_switch-optimized
-
-  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_llvm() {
-  pkgdesc="Low Level Virtual Machine"
-  depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
-
-  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"
-
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-  mv "$srcdir/clang" tools
-
-  # The runtime library goes into llvm-libs
-  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
-
-  # OCaml bindings go to a separate package
-  rm -rf "$srcdir"/{ocaml,ocamldoc}
-  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
-  # Remove duplicate files installed by the OCaml bindings
-  rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/*.a
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib/*LLVMHello.*
-
-  # Symlink LLVMgold.so into /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"
-
-  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/$pkgname/html/"
-  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-libs() {
-  pkgdesc="Low Level Virtual Machine (runtime library)"
-  depends=('gcc-libs' 'zlib' 'libffi')
-
-  install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.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=$pkgver-$pkgrel" 'ocaml')
-
-  cd "$srcdir/llvm-$pkgver.src"
-
-  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
-  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
-  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
-  # Remove execute bit from static libraries
-  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
-  pkgdesc="C language family frontend for LLVM"
-  url="http://clang.llvm.org/"
-  depends=("llvm=$pkgver-$pkgrel" 'gcc')
-
-  # 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/$pkgname/html/"
-  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
-  pkgdesc="A source code analysis framework"
-  url="http://clang-analyzer.llvm.org/"
-  depends=("clang=$pkgver-$pkgrel" 'python2')
-
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
-
-  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
-  for _tool in scan-{build,view}; do
-    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
-    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
-  done
-
-  # scan-build looks for clang within the same directory
-  ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/"
-
-  # Relocate man page
-  install -d "$pkgdir/usr/share/man/man1"
-  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
-    "$pkgdir/usr/share/man/man1/"
-
-  # Use Python 2
-  sed -i \
-    -e 's|env python$|&2|' \
-    -e 's|/usr/bin/python$|&2|' \
-    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
-    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
-  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: llvm/repos/extra-i686/PKGBUILD (from rev 197047, llvm/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-10-21 14:52:40 UTC (rev 197048)
@@ -0,0 +1,228 @@
+# $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' 'clang' 'clang-analyzer')
+pkgver=3.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
+options=('staticlibs')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
+        clang-3.3-use-gold-linker.patch
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h)
+sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
+            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
+            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
+            '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+
+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 insecure rpath (http://bugs.archlinux.org/task/14017)
+  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+
+  # Make -flto work; use ld.gold instead of the default linker
+  patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
+}
+
+build() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # Apply strip option to configure
+  _optimized_switch="enable"
+  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
+
+  # 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-libffi \
+    --enable-targets=all \
+    --enable-experimental-targets=R600 \
+    --disable-expensive-checks \
+    --disable-debug-runtime \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --with-python=/usr/bin/python2 \
+    --$_optimized_switch-optimized
+
+  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_llvm() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
+
+  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"
+
+  # -j1 is due to race conditions during the installation of the OCaml bindings
+  make -j1 DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools
+
+  # The runtime library goes into llvm-libs
+  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
+
+  # OCaml bindings go to a separate package
+  rm -rf "$srcdir"/{ocaml,ocamldoc}
+  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
+
+  # Remove duplicate files installed by the OCaml bindings
+  rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/*LLVMHello.*
+
+  # Symlink LLVMgold.so into /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"
+
+  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/$pkgname/html/"
+  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-libs() {
+  pkgdesc="Low Level Virtual Machine (runtime library)"
+  depends=('gcc-libs' 'zlib' 'libffi')
+
+  install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.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=$pkgver-$pkgrel" 'ocaml')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
+  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
+  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
+
+  # Remove execute bit from static libraries
+  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+}
+
+package_clang() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  depends=("llvm=$pkgver-$pkgrel" 'gcc')
+
+  # 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/$pkgname/html/"
+  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+}
+
+package_clang-analyzer() {
+  pkgdesc="A source code analysis framework"
+  url="http://clang-analyzer.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel" 'python2')
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+
+  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
+  for _tool in scan-{build,view}; do
+    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
+    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
+  done
+
+  # scan-build looks for clang within the same directory
+  ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/"
+
+  # Relocate man page
+  install -d "$pkgdir/usr/share/man/man1"
+  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
+    "$pkgdir/usr/share/man/man1/"
+
+  # Use Python 2
+  sed -i \
+    -e 's|env python$|&2|' \
+    -e 's|/usr/bin/python$|&2|' \
+    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
+    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+
+  # Compile Python scripts
+  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
+  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/clang-3.3-use-gold-linker.patch
===================================================================
--- extra-i686/clang-3.3-use-gold-linker.patch	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-i686/clang-3.3-use-gold-linker.patch	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,12 +0,0 @@
-diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp
---- cfe.src.orig/lib/Driver/ToolChains.cpp	2013-06-08 16:17:19.000000000 +0300
-+++ cfe.src/lib/Driver/ToolChains.cpp	2013-06-08 16:17:33.000000000 +0300
-@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm
-   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
-                          GCCInstallation.getTriple().str() + "/bin").str());
- 
--  Linker = GetProgramPath("ld");
-+  Linker = GetProgramPath("ld.gold");
- 
-   Distro Distro = DetectDistro(Arch);
- 

Copied: llvm/repos/extra-i686/clang-3.3-use-gold-linker.patch (from rev 197047, llvm/trunk/clang-3.3-use-gold-linker.patch)
===================================================================
--- extra-i686/clang-3.3-use-gold-linker.patch	                        (rev 0)
+++ extra-i686/clang-3.3-use-gold-linker.patch	2013-10-21 14:52:40 UTC (rev 197048)
@@ -0,0 +1,12 @@
+diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp
+--- cfe.src.orig/lib/Driver/ToolChains.cpp	2013-06-08 16:17:19.000000000 +0300
++++ cfe.src/lib/Driver/ToolChains.cpp	2013-06-08 16:17:33.000000000 +0300
+@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm
+   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
+                          GCCInstallation.getTriple().str() + "/bin").str());
+ 
+-  Linker = GetProgramPath("ld");
++  Linker = GetProgramPath("ld.gold");
+ 
+   Distro Distro = DetectDistro(Arch);
+ 

Deleted: extra-i686/llvm-Config-config.h
===================================================================
--- extra-i686/llvm-Config-config.h	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-i686/llvm-Config-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,9 +0,0 @@
-#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: llvm/repos/extra-i686/llvm-Config-config.h (from rev 197047, llvm/trunk/llvm-Config-config.h)
===================================================================
--- extra-i686/llvm-Config-config.h	                        (rev 0)
+++ extra-i686/llvm-Config-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -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

Deleted: extra-i686/llvm-Config-llvm-config.h
===================================================================
--- extra-i686/llvm-Config-llvm-config.h	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-i686/llvm-Config-llvm-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,9 +0,0 @@
-#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/extra-i686/llvm-Config-llvm-config.h (from rev 197047, llvm/trunk/llvm-Config-llvm-config.h)
===================================================================
--- extra-i686/llvm-Config-llvm-config.h	                        (rev 0)
+++ extra-i686/llvm-Config-llvm-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-x86_64/PKGBUILD	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,227 +0,0 @@
-# $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' 'clang' 'clang-analyzer')
-pkgver=3.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
-        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
-        clang-3.3-use-gold-linker.patch
-        llvm-Config-config.h
-        llvm-Config-llvm-config.h)
-sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
-            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
-            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
-            '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
-            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
-            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
-
-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 insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Make -flto work; use ld.gold instead of the default linker
-  patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
-}
-
-build() {
-  cd "$srcdir/llvm-$pkgver.src"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # 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-libffi \
-    --enable-targets=all \
-    --enable-experimental-targets=R600 \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-python=/usr/bin/python2 \
-    --$_optimized_switch-optimized
-
-  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_llvm() {
-  pkgdesc="Low Level Virtual Machine"
-  depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
-
-  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"
-
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-  mv "$srcdir/clang" tools
-
-  # The runtime library goes into llvm-libs
-  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
-
-  # OCaml bindings go to a separate package
-  rm -rf "$srcdir"/{ocaml,ocamldoc}
-  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
-  # Remove duplicate files installed by the OCaml bindings
-  rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/*.a
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib/*LLVMHello.*
-
-  # Symlink LLVMgold.so into /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"
-
-  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/$pkgname/html/"
-  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-libs() {
-  pkgdesc="Low Level Virtual Machine (runtime library)"
-  depends=('gcc-libs' 'zlib' 'libffi')
-
-  install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.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=$pkgver-$pkgrel" 'ocaml')
-
-  cd "$srcdir/llvm-$pkgver.src"
-
-  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
-  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
-  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
-  # Remove execute bit from static libraries
-  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
-  pkgdesc="C language family frontend for LLVM"
-  url="http://clang.llvm.org/"
-  depends=("llvm=$pkgver-$pkgrel" 'gcc')
-
-  # 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/$pkgname/html/"
-  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
-  pkgdesc="A source code analysis framework"
-  url="http://clang-analyzer.llvm.org/"
-  depends=("clang=$pkgver-$pkgrel" 'python2')
-
-  cd "$srcdir/llvm-$pkgver.src/tools/clang"
-
-  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
-  for _tool in scan-{build,view}; do
-    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
-    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
-  done
-
-  # scan-build looks for clang within the same directory
-  ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/"
-
-  # Relocate man page
-  install -d "$pkgdir/usr/share/man/man1"
-  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
-    "$pkgdir/usr/share/man/man1/"
-
-  # Use Python 2
-  sed -i \
-    -e 's|env python$|&2|' \
-    -e 's|/usr/bin/python$|&2|' \
-    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
-    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
-  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: llvm/repos/extra-x86_64/PKGBUILD (from rev 197047, llvm/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-10-21 14:52:40 UTC (rev 197048)
@@ -0,0 +1,228 @@
+# $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' 'clang' 'clang-analyzer')
+pkgver=3.3
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://llvm.org/"
+license=('custom:University of Illinois/NCSA Open Source License')
+makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
+options=('staticlibs')
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
+        clang-3.3-use-gold-linker.patch
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h)
+sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578'
+            'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996'
+            '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423'
+            '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
+
+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 insecure rpath (http://bugs.archlinux.org/task/14017)
+  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+
+  # Make -flto work; use ld.gold instead of the default linker
+  patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
+}
+
+build() {
+  cd "$srcdir/llvm-$pkgver.src"
+
+  # Apply strip option to configure
+  _optimized_switch="enable"
+  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
+
+  # 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-libffi \
+    --enable-targets=all \
+    --enable-experimental-targets=R600 \
+    --disable-expensive-checks \
+    --disable-debug-runtime \
+    --disable-assertions \
+    --with-binutils-include=/usr/include \
+    --with-python=/usr/bin/python2 \
+    --$_optimized_switch-optimized
+
+  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_llvm() {
+  pkgdesc="Low Level Virtual Machine"
+  depends=("llvm-libs=$pkgver-$pkgrel" 'perl')
+
+  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"
+
+  # -j1 is due to race conditions during the installation of the OCaml bindings
+  make -j1 DESTDIR="$pkgdir" install
+  mv "$srcdir/clang" tools
+
+  # The runtime library goes into llvm-libs
+  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
+
+  # OCaml bindings go to a separate package
+  rm -rf "$srcdir"/{ocaml,ocamldoc}
+  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
+
+  # Remove duplicate files installed by the OCaml bindings
+  rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
+
+  # Fix permissions of static libs
+  chmod -x "$pkgdir"/usr/lib/*.a
+
+  # Get rid of example Hello transformation
+  rm "$pkgdir"/usr/lib/*LLVMHello.*
+
+  # Symlink LLVMgold.so into /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"
+
+  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/$pkgname/html/"
+  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_llvm-libs() {
+  pkgdesc="Low Level Virtual Machine (runtime library)"
+  depends=('gcc-libs' 'zlib' 'libffi')
+
+  install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.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=$pkgver-$pkgrel" 'ocaml')
+
+  cd "$srcdir/llvm-$pkgver.src"
+
+  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
+  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
+  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
+
+  # Remove execute bit from static libraries
+  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
+}
+
+package_clang() {
+  pkgdesc="C language family frontend for LLVM"
+  url="http://clang.llvm.org/"
+  depends=("llvm=$pkgver-$pkgrel" 'gcc')
+
+  # 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/$pkgname/html/"
+  rm -r "$pkgdir/usr/share/doc/$pkgname/html/_sources"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
+}
+
+package_clang-analyzer() {
+  pkgdesc="A source code analysis framework"
+  url="http://clang-analyzer.llvm.org/"
+  depends=("clang=$pkgver-$pkgrel" 'python2')
+
+  cd "$srcdir/llvm-$pkgver.src/tools/clang"
+
+  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
+  for _tool in scan-{build,view}; do
+    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
+    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
+  done
+
+  # scan-build looks for clang within the same directory
+  ln -s /usr/bin/clang "$pkgdir/usr/lib/clang-analyzer/scan-build/"
+
+  # Relocate man page
+  install -d "$pkgdir/usr/share/man/man1"
+  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
+    "$pkgdir/usr/share/man/man1/"
+
+  # Use Python 2
+  sed -i \
+    -e 's|env python$|&2|' \
+    -e 's|/usr/bin/python$|&2|' \
+    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
+    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+
+  # Compile Python scripts
+  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
+  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
+
+  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/clang-3.3-use-gold-linker.patch
===================================================================
--- extra-x86_64/clang-3.3-use-gold-linker.patch	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-x86_64/clang-3.3-use-gold-linker.patch	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,12 +0,0 @@
-diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp
---- cfe.src.orig/lib/Driver/ToolChains.cpp	2013-06-08 16:17:19.000000000 +0300
-+++ cfe.src/lib/Driver/ToolChains.cpp	2013-06-08 16:17:33.000000000 +0300
-@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm
-   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
-                          GCCInstallation.getTriple().str() + "/bin").str());
- 
--  Linker = GetProgramPath("ld");
-+  Linker = GetProgramPath("ld.gold");
- 
-   Distro Distro = DetectDistro(Arch);
- 

Copied: llvm/repos/extra-x86_64/clang-3.3-use-gold-linker.patch (from rev 197047, llvm/trunk/clang-3.3-use-gold-linker.patch)
===================================================================
--- extra-x86_64/clang-3.3-use-gold-linker.patch	                        (rev 0)
+++ extra-x86_64/clang-3.3-use-gold-linker.patch	2013-10-21 14:52:40 UTC (rev 197048)
@@ -0,0 +1,12 @@
+diff -upr cfe.src.orig/lib/Driver/ToolChains.cpp cfe.src/lib/Driver/ToolChains.cpp
+--- cfe.src.orig/lib/Driver/ToolChains.cpp	2013-06-08 16:17:19.000000000 +0300
++++ cfe.src/lib/Driver/ToolChains.cpp	2013-06-08 16:17:33.000000000 +0300
+@@ -2220,7 +2220,7 @@ Linux::Linux(const Driver &D, const llvm
+   PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
+                          GCCInstallation.getTriple().str() + "/bin").str());
+ 
+-  Linker = GetProgramPath("ld");
++  Linker = GetProgramPath("ld.gold");
+ 
+   Distro Distro = DetectDistro(Arch);
+ 

Deleted: extra-x86_64/llvm-Config-config.h
===================================================================
--- extra-x86_64/llvm-Config-config.h	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-x86_64/llvm-Config-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,9 +0,0 @@
-#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: llvm/repos/extra-x86_64/llvm-Config-config.h (from rev 197047, llvm/trunk/llvm-Config-config.h)
===================================================================
--- extra-x86_64/llvm-Config-config.h	                        (rev 0)
+++ extra-x86_64/llvm-Config-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -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

Deleted: extra-x86_64/llvm-Config-llvm-config.h
===================================================================
--- extra-x86_64/llvm-Config-llvm-config.h	2013-10-21 14:51:04 UTC (rev 197047)
+++ extra-x86_64/llvm-Config-llvm-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -1,9 +0,0 @@
-#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/extra-x86_64/llvm-Config-llvm-config.h (from rev 197047, llvm/trunk/llvm-Config-llvm-config.h)
===================================================================
--- extra-x86_64/llvm-Config-llvm-config.h	                        (rev 0)
+++ extra-x86_64/llvm-Config-llvm-config.h	2013-10-21 14:52:40 UTC (rev 197048)
@@ -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