From 85be6f08e6368a31e9f971c043b11e8c12ce6545 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 15 May 2014 04:03:11 +0000 Subject: Thu May 15 03:57:18 UTC 2014 --- extra/llvm/PKGBUILD | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'extra/llvm/PKGBUILD') diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 4f4f057a1..bd2649240 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212082 2014-05-06 14:39:43Z foutrelis $ +# $Id: PKGBUILD 212366 2014-05-14 06:58:53Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens # Contributor: Sebastian Nowicki @@ -11,42 +11,54 @@ pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer' 'clang-tools-extra') -pkgver=3.4 +pkgver=3.4.1 +_base_ver=3.4 pkgrel=2 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/clang-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz{,.sig} + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz{,.sig} + http://llvm.org/releases/$_base_ver/clang-tools-extra-$_base_ver.src.tar.gz{,.sig} + http://llvm.org/releases/$_base_ver/compiler-rt-$_base_ver.src.tar.gz{,.sig} clang-3.3-use-gold-linker.patch clang-3.4-max_align_t.patch + clang-3.4-fstack-protector-strong.patch llvm-3.4-provide-cmake-modules.patch llvm-Config-config.h llvm-Config-llvm-config.h) -sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628' - '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b' +sha256sums=('7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a' + 'SKIP' + 'ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7' + 'SKIP' 'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4' + 'SKIP' 'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c' + 'SKIP' '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' '0f0cbff69af54e83383385abbdeb1fee23e6e69427f8530060c492c0b07c2bbe' + '7a2a1ddc94f67e643c1ab74601ec07deb6d5d344d4b19ed17c900afb2f6f2863' 'b6bb154d5ec998328e818bb09acfc6229e41367ba45cea7cc5b2dd2a7c835cf5' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { + # Change directory names to release names so we don't need to change the + # whole PKGBUILD + mv llvm-$pkgver{.src,} + mv cfe-$pkgver.src clang-$pkgver + cd "$srcdir/llvm-$pkgver" # 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/clang-$pkgver" tools/clang - mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra + mv "$srcdir/clang-tools-extra-$_base_ver" tools/clang/tools/extra - mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt + mv "$srcdir/compiler-rt-$_base_ver" projects/compiler-rt # Fix docs installation directory sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ @@ -59,6 +71,10 @@ prepare() { # http://reviews.llvm.org/rL201729 patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-max_align_t.patch" + # Add command line option -fstack-protector-strong + # http://reviews.llvm.org/rL201120 + patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-fstack-protector-strong.patch" + # Provide CMake modules (FS#38705) # http://reviews.llvm.org/rL201047 # http://reviews.llvm.org/rL201048 @@ -113,6 +129,7 @@ package_llvm() { # The runtime library goes into llvm-libs mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir" + rm "$pkgdir/usr/lib/libLLVM-$_base_ver.so" # OCaml bindings go to a separate package rm -rf "$srcdir"/{ocaml,ocamldoc} @@ -158,6 +175,7 @@ package_llvm-libs() { depends=('gcc-libs' 'zlib' 'libffi' 'ncurses') install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so" + ln -s libLLVM-$pkgver.so "$pkgdir/usr/lib/libLLVM-$_base_ver.so" install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -- cgit v1.2.3-54-g00ecf