Forgotten PKGBUILD + .SRCINFO

2 files changed, 78 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba146b214b23..ab677872b83e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jan 28 14:01:41 UTC 2016
+# Thu Jan 28 14:20:09 UTC 2016
 pkgbase = llvm-debug
 	pkgver = 258811
-	pkgrel = 1
+	pkgrel = 2
 	url = http://llvm.org
 	arch = i686
 	arch = x86_64
@@ -21,6 +21,7 @@ pkgbase = llvm-debug
 	source = llvm-Config-config.h
 	source = llvm-Config-llvm-config.h
 	source = bug-20176-template-friend-fix.patch
+	source = fix-cxx11-abi-tags.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -28,11 +29,15 @@ pkgbase = llvm-debug
 	sha256sums = 312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3
 	sha256sums = 597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48
 	sha256sums = b3d583b2609c28b7b41cae828b85f96b882b9b5474f3d888e72734fb00879d3d
+	sha256sums = ae4e0c93ed16fa4c87e7ce0604bd6bd2407735604826d99c3458066536d8c8be
 
 pkgname = llvm-debug
 	pkgdesc = Low Level Virtual Machine
-	depends = llvm-libs-debug=258811-1
+	depends = llvm-libs-debug=258811-2
 	depends = perl
+	provides = llvm
+	conflicts = llvm
+	replaces = llvm
 
 pkgname = llvm-libs-debug
 	pkgdesc = Low Level Virtual Machine (runtime library)
@@ -40,21 +45,33 @@ pkgname = llvm-libs-debug
 	depends = zlib
 	depends = libffi
 	depends = ncurses
+	provides = llvm-libs
+	conflicts = llvm-libs
+	replaces = llvm-libs
 
 pkgname = clang-debug
 	pkgdesc = C language family frontend for LLVM
 	url = http://clang.llvm.org/
-	depends = llvm-debug=258811-1
+	depends = llvm-debug=258811-2
 	depends = gcc
+	provides = clang
+	conflicts = clang
+	replaces = clang
 
 pkgname = clang-analyzer-debug
 	pkgdesc = A source code analysis framework
 	url = http://clang-analyzer.llvm.org/
-	depends = clang-debug=258811-1
+	depends = clang-debug=258811-2
 	depends = python2
+	provides = clang-analyzer
+	conflicts = clang-analyzer
+	replaces = clang-analyzer
 
 pkgname = clang-tools-extra-debug
 	pkgdesc = Extra tools built using Clang's tooling APIs
 	url = http://clang.llvm.org/
-	depends = clang-debug=258811-1
+	depends = clang-debug=258811-2
+	provides = clang-tools-extra
+	conflicts = clang-tools-extra
+	replaces = clang-tools-extra
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d9907e031b5..d52a711cf608 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgbase=llvm-debug
 pkgname=('llvm-debug' 'llvm-libs-debug' 'clang-debug' 'clang-analyzer-debug' 'clang-tools-extra-debug')
 _pkgname='llvm'
-pkgver=255492
+pkgver=258811
 pkgrel=2
 arch=('i686' 'x86_64')
 url="http://llvm.org"
@@ -30,14 +30,16 @@ source=("${_pkgname}::svn+http://llvm.org/svn/llvm-project/llvm/tags/${_svn_tag}
         "compiler-rt::svn+http://llvm.org/svn/llvm-project/compiler-rt/tags/${_svn_tag}"
         llvm-Config-config.h
         llvm-Config-llvm-config.h
-        bug-20176-template-friend-fix.patch)
+        bug-20176-template-friend-fix.patch
+        fix-cxx11-abi-tags.patch)
 sha256sums=('SKIP'
             'SKIP'    
             'SKIP'
             'SKIP'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
-            'b3d583b2609c28b7b41cae828b85f96b882b9b5474f3d888e72734fb00879d3d')
+            'b3d583b2609c28b7b41cae828b85f96b882b9b5474f3d888e72734fb00879d3d'
+            'ae4e0c93ed16fa4c87e7ce0604bd6bd2407735604826d99c3458066536d8c8be')
 
 _ocamlver()
 {
@@ -50,6 +52,8 @@ pkgver()
     svnversion | tr -d [A-z]
 }
 
+_install_prefix="/opt/clang/3.5.1"
+
 prepare() {
     cd "${srcdir}/${_pkgname}"
 
@@ -82,7 +86,7 @@ build() {
     # Force the use of GCC instead of clang
     CC=gcc CXX=g++ \
     ./configure \
-        --prefix=/usr \
+        --prefix=$_install_prefix \
         --sysconfdir=/etc \
         --enable-shared \
         --enable-libffi \
@@ -119,45 +123,45 @@ package_llvm-debug() {
 
     # The runtime library goes into llvm-libs
     rm -rf "${srcdir}"/*.so
-    mv "${pkgdir}"/usr/lib/libLLVM-*.so "${srcdir}/"
+    mv "${pkgdir}"$_install_prefix/lib/libLLVM-*.so "${srcdir}/"
 
     # OCaml bindings go to a separate package
     rm -rf "${srcdir}"/ocaml
-    mv "${pkgdir}"/usr/lib/ocaml "${srcdir}/"
+    mv "${pkgdir}"$_install_prefix/lib/ocaml "${srcdir}/"
 
     # Remove duplicate files installed by the OCaml bindings
-    rm -rf "${pkgdir}"/usr/lib/libllvm*
+    rm -rf "${pkgdir}"$_install_prefix/lib/libllvm*
 
     # Fix permissions of static libs
-    chmod -x "${pkgdir}"/usr/lib/*.a
+    chmod -x "${pkgdir}"$_install_prefix/lib/*.a
 
     # Get rid of example Hello transformation
-    rm -rf "${pkgdir}"/usr/lib/*LLVMHello.*
+    rm -rf "${pkgdir}"$_install_prefix/lib/*LLVMHello.*
 
     # Symlink LLVMgold.so into /usr/lib/bfd-plugins
     # https://bugs.archlinux.org/task/28479
-    install -m755 -d "${pkgdir}/usr/lib/bfd-plugins"
-    ln -s ../LLVMgold.so "${pkgdir}/usr/lib/bfd-plugins/LLVMgold.so"
+    install -m755 -d "${pkgdir}$_install_prefix/lib/bfd-plugins"
+    ln -s ../LLVMgold.so "${pkgdir}$_install_prefix/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
+            mv "${pkgdir}$_install_prefix/include/llvm/Config/${_header}"{,-64}.h
             cp "${srcdir}/llvm-Config-${_header}.h" \
-                 "${pkgdir}/usr/include/llvm/Config/${_header}.h"
+                 "${pkgdir}$_install_prefix/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 -d "${pkgdir}$_install_prefix/share/man/man1"
+    cp docs/_build/man/*.1 "${pkgdir}$_install_prefix/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"
+    cp -r docs/_build/html/* "${pkgdir}$_install_prefix/share/doc/$_pkgname/html/"
+    rm -r "${pkgdir}$_install_prefix/share/doc/${_pkgname}/html/_sources"
 
-    install -Dm644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE.TXT "${pkgdir}$_install_prefix/share/licenses/${pkgname}/LICENSE"
 }
 
 package_llvm-libs-debug() {
@@ -167,16 +171,16 @@ package_llvm-libs-debug() {
     replaces=('llvm-libs')
     conflicts=('llvm-libs')
 
-    install -m755 -d "${pkgdir}"/usr/lib/
+    install -m755 -d "${pkgdir}"$_install_prefix/lib/
 
-    mv "${srcdir}"/libLLVM-*.so "${pkgdir}/usr/lib/"
+    mv "${srcdir}"/libLLVM-*.so "${pkgdir}$_install_prefix/lib/"
 
-    for _shlib in "${pkgdir}"/usr/lib/*.so
+    for _shlib in "${pkgdir}"$_install_prefix/lib/*.so
     do
       test -L "${_shlib}" && ln -sf $(basename $(readlink ${_shlib})) ${_shlib}
     done
 
-    install -Dm644 "${srcdir}/${_pkgname}/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${srcdir}/${_pkgname}/LICENSE.TXT" "${pkgdir}$_install_prefix/share/licenses/${pkgname}/LICENSE"
 }
 
 package_clang-debug() {
@@ -200,40 +204,40 @@ package_clang-debug() {
     mv "${srcdir}/extra" tools/
 
     # Fix permissions of static libs
-    chmod -x "${pkgdir}"/usr/lib/*.a
+    chmod -x "${pkgdir}"$_install_prefix/lib/*.a
 
     # Revert the path change in case we want to do a repackage later
     sed -e 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
         -i "${srcdir}/${_pkgname}/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"
+    cp -r docs/_build/html/* "${pkgdir}$_install_prefix/share/doc/clang/html/"
+    rm -r "${pkgdir}$_install_prefix/share/doc/clang/html/_sources"
 
     # Install Python bindings
-    install -m755 -d "${pkgdir}/usr/lib/python2.7/site-packages"
-    cp -r bindings/python/clang "${pkgdir}/usr/lib/python2.7/site-packages/"
-    python2 -m compileall "${pkgdir}/usr/lib/python2.7/site-packages/clang"
-    python2 -O -m compileall "${pkgdir}/usr/lib/python2.7/site-packages/clang"
+    install -m755 -d "${pkgdir}$_install_prefix/lib/python2.7/site-packages"
+    cp -r bindings/python/clang "${pkgdir}$_install_prefix/lib/python2.7/site-packages/"
+    python2 -m compileall "${pkgdir}$_install_prefix/lib/python2.7/site-packages/clang"
+    python2 -O -m compileall "${pkgdir}$_install_prefix/lib/python2.7/site-packages/clang"
 
     # Install clang-format editor integration files (FS#38485)
     # Destination paths are copied from clang-format/CMakeLists.txt
-    install -m755 -d "$pkgdir/usr/share/clang"
+    install -m755 -d "$pkgdir$_install_prefix/share/clang"
     (
     cd tools/clang-format
     cp clang-format-diff.py \
        clang-format-sublime.py \
        clang-format.el \
        clang-format.py \
-       "${pkgdir}/usr/share/clang/"
+       "${pkgdir}$_install_prefix/share/clang/"
 
-      cp git-clang-format "${pkgdir}/usr/bin/"
-      sed -e 's|/usr/bin/python$|&2|' \
-          -i "${pkgdir}/usr/bin/git-clang-format" \
-          -i "${pkgdir}/usr/share/clang/clang-format-diff.py"
+      cp git-clang-format "${pkgdir}$_install_prefix/bin/"
+      sed -e 's|$_install_prefix/bin/python$|&2|' \
+          -i "${pkgdir}$_install_prefix/bin/git-clang-format" \
+          -i "${pkgdir}$_install_prefix/share/clang/clang-format-diff.py"
     )
 
-    install -Dm644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE.TXT "${pkgdir}$_install_prefix/share/licenses/${pkgname}/LICENSE"
 }
 
 package_clang-analyzer-debug() {
@@ -246,31 +250,31 @@ package_clang-analyzer-debug() {
 
     cd "${srcdir}/${_pkgname}/tools/clang"
 
-    install -m755 -d "${pkgdir}"/usr/{bin,lib/clang-analyzer}
+    install -m755 -d "${pkgdir}"$_install_prefix/{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/"
+        cp -r tools/${_tool} "${pkgdir}$_install_prefix/lib/clang-analyzer/"
+        ln -s $_install_prefix/lib/clang-analyzer/${_tool}/${_tool} "${pkgdir}$_install_prefix/bin/"
     done
 
     # scan-build looks for clang within the same directory
-    ln -s /usr/bin/clang "${pkgdir}/usr/lib/clang-analyzer/scan-build/"
+    ln -s $_install_prefix/bin/clang "${pkgdir}$_install_prefix/lib/clang-analyzer/scan-build/"
 
     # Relocate man page
-    install -m755 -d "${pkgdir}/usr/share/man/man1"
-    mv "${pkgdir}/usr/lib/clang-analyzer/scan-build/scan-build.1" \
-       "${pkgdir}/usr/share/man/man1/"
+    install -m755 -d "${pkgdir}$_install_prefix/share/man/man1"
+    mv "${pkgdir}$_install_prefix/lib/clang-analyzer/scan-build/scan-build.1" \
+       "${pkgdir}$_install_prefix/share/man/man1/"
 
     # Use Python 2
     sed -e 's|env python$|&2|' \
-        -e 's|/usr/bin/python$|&2|' \
-        -i "${pkgdir}/usr/lib/clang-analyzer/scan-view/scan-view" \
-           "${pkgdir}/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
+        -e 's|$_install_prefix/bin/python$|&2|' \
+        -i "${pkgdir}$_install_prefix/lib/clang-analyzer/scan-view/scan-view" \
+           "${pkgdir}$_install_prefix/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"
+    python2 -m compileall "${pkgdir}$_install_prefix/lib/clang-analyzer"
+    python2 -O -m compileall "${pkgdir}$_install_prefix/lib/clang-analyzer"
 
-    install -Dm644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE.TXT "${pkgdir}$_install_prefix/share/licenses/${pkgname}/LICENSE"
 }
 
 package_clang-tools-extra-debug() {
@@ -286,7 +290,7 @@ package_clang-tools-extra-debug() {
     make DESTDIR="${pkgdir}" install
 
     # Fix permissions of static libs
-    chmod -x "${pkgdir}"/usr/lib/*.a
+    chmod -x "${pkgdir}"$_install_prefix/lib/*.a
 
-    install -Dm644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 LICENSE.TXT "${pkgdir}$_install_prefix/share/licenses/${pkgname}/LICENSE"
 }