diff options
Diffstat (limited to 'extra/llvm/PKGBUILD')
| -rw-r--r-- | extra/llvm/PKGBUILD | 76 |
1 files changed, 45 insertions, 31 deletions
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 099dac6f4..515dbc750 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157403 2012-04-28 09:26:49Z allan $ +# $Id: PKGBUILD 159472 2012-05-24 20:02:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -10,40 +10,42 @@ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.0 -pkgrel=4 +pkgver=3.1 +pkgrel=2 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml') -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz - clang-plugin-loader-registry.patch +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz + http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz + http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz + llvm-Config-config.h + llvm-Config-llvm-config.h cindexer-clang-path.patch clang-pure64.patch enable-lto.patch - fix-gold-lto-linking.patch) -sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477' - 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d' - 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c' + clang-3.1-fix-libprofile_rt.a-location.patch) +sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab' + 'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786' + '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558' + '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' + '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' - 'cf8922a932e1859f3783bef2af8ac1e90ce96f8eec79928392327b71b3d7cb89' - '24d275cdf170f53844bc7174b065fb51b6ddbb9642ced34702cde1f0f74d9192') + 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7' + '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') build() { cd "$srcdir/$pkgname-$pkgver.src" - # Build without -ftree-pre as a workaround for clang segfaulting on x86_64 - # https://bugzilla.redhat.com/show_bug.cgi?id=791365 - CFLAGS+=' -fno-tree-pre' - CXXFLAGS+=' -fno-tree-pre' - # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 rm -rf tools/clang cp -r "$srcdir/clang-$pkgver.src" tools/clang + rm -rf projects/compiler-rt + cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt + # Fix symbolic links from OCaml bindings to LLVM libraries sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml @@ -52,14 +54,15 @@ build() { -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in + sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \ + tools/llvm-config/llvm-config.cpp + sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \ + autoconf/configure.ac \ + configure # Fix insecure rpath (http://bugs.archlinux.org/task/14017) sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" @@ -72,8 +75,9 @@ build() { # Use gold instead of default linker, and always use the plugin patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - # Fix libLTO.so location in gold plugin - patch -Np1 -i "$srcdir/fix-gold-lto-linking.patch" + # Fix FS#29984: [clang] -coverage is broken + patch -d tools/clang -Np1 -i \ + "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" # Apply strip option to configure _optimized_switch="enable" @@ -82,6 +86,11 @@ build() { # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + # Use Python 2 + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + # Force the use of GCC instead of clang CC=gcc CXX=g++ \ ./configure \ @@ -110,10 +119,6 @@ package_llvm() { # then we bring it back in for the clang package mv tools/clang "$srcdir" - # Copy missing file into the expected location - [[ $(check_option strip) == y ]] && _build_type=Release || _build_type=Debug - cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/$_build_type/ - # -j1 is due to race conditions during the installation of the OCaml bindings make -j1 DESTDIR="$pkgdir" install mv "$srcdir/clang" tools @@ -128,9 +133,6 @@ package_llvm() { # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib/llvm/*.a - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - # Get rid of example Hello transformation rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* @@ -143,6 +145,16 @@ package_llvm() { install -d "$pkgdir/usr/lib/bfd-plugins" ln -s ../llvm/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 -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -198,7 +210,9 @@ package_clang-analyzer() { done # Use Python 2 - sed -i 's/env 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" |