From 3c8e479bfe9fab72058c833f2909a26232114733 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Jun 2013 01:18:25 -0700 Subject: Mon Jun 17 01:18:13 PDT 2013 --- extra/cups-pk-helper/PKGBUILD | 6 +- extra/gtk2/PKGBUILD | 6 +- extra/libbsd/LICENSE | 28 - extra/libbsd/PKGBUILD | 24 +- extra/libkeybinder3/PKGBUILD | 29 + extra/libmbim/PKGBUILD | 14 +- extra/libmbim/format.patch | 14 - extra/llvm/PKGBUILD | 130 ++-- extra/llvm/cindexer-clang-path.patch | 10 - .../clang-3.1-fix-libprofile_rt.a-location.patch | 12 - .../clang-3.2-fix-std-thread-with-libstdc++.patch | 17 - extra/llvm/clang-3.3-use-gold-linker.patch | 12 + extra/llvm/enable-lto.patch | 30 - extra/llvm/llvm-3.1-fix-debug-line-info.patch | 65 -- extra/opengtl/PKGBUILD | 15 +- extra/opengtl/opengtl-0.9.18-llvm-3.3.patch | 732 +++++++++++++++++++++ 16 files changed, 860 insertions(+), 284 deletions(-) delete mode 100644 extra/libbsd/LICENSE create mode 100644 extra/libkeybinder3/PKGBUILD delete mode 100644 extra/libmbim/format.patch delete mode 100644 extra/llvm/cindexer-clang-path.patch delete mode 100644 extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch delete mode 100644 extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch create mode 100644 extra/llvm/clang-3.3-use-gold-linker.patch delete mode 100644 extra/llvm/enable-lto.patch delete mode 100644 extra/llvm/llvm-3.1-fix-debug-line-info.patch create mode 100644 extra/opengtl/opengtl-0.9.18-llvm-3.3.patch (limited to 'extra') diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index 1bfe06932..48f853f19 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,7 +1,7 @@ -#$Id: PKGBUILD 169617 2012-10-24 17:03:25Z ibiru $ +#$Id: PKGBUILD 188583 2013-06-16 10:29:51Z tomegun $ # Maintainer: Ionut Biru pkgname=cups-pk-helper -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64) @@ -10,7 +10,7 @@ license=('GPL') depends=(polkit libcups) makedepends=(intltool) source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('d187dc994ff64621aa090d114170b292daa11122481d8b8adb7613b32ca4e3c3') +sha256sums=('19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118') build() { cd $pkgname-$pkgver diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index d0380b417..7297c1069 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185341 2013-05-13 13:52:12Z heftig $ +# $Id: PKGBUILD 188597 2013-06-16 18:27:06Z heftig $ # Maintainer: Jan de Groot pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.18 +pkgver=2.24.19 pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385' +sha256sums=('15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/libbsd/LICENSE b/extra/libbsd/LICENSE deleted file mode 100644 index 7dcbfc2ba..000000000 --- a/extra/libbsd/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -/*- - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index 7bc5012be..c2215585e 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 180872 2013-03-27 14:45:32Z tpowa $ +# $Id: PKGBUILD 188599 2013-06-16 20:01:01Z eric $ # Maintainer: Sven-Hendrik Haase # Contributor: Gerardo Exequiel Pozzi pkgname=libbsd -pkgver=0.4.2 +pkgver=0.5.2 pkgrel=1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64') url="http://libbsd.freedesktop.org" license=('custom') depends=('glibc') -source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) -md5sums=('591fc9de4ca22f78cf87a94e648a92f4') +options=('!libtool') +source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}) +md5sums=('be8b2e0dc4614699834c49693574fd1a' + 'SKIP') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } +check() { + cd $pkgname-$pkgver + + make check +} + package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + make DESTDIR="$pkgdir" install + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD new file mode 100644 index 000000000..6f6964d20 --- /dev/null +++ b/extra/libkeybinder3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 188580 2013-06-16 02:22:32Z eric $ +# Maintainer: Eric Bélanger +# Contributor: speps + +pkgname=libkeybinder3 +pkgver=0.3.0 +pkgrel=2 +pkgdesc="A library for registering global keyboard shortcuts" +arch=('i686' 'x86_64') +url="http://kaizer.se/wiki/keybinder/" +license=('MIT') +depends=('gtk3') +makedepends=('gtk-doc') +optdepends=('lua-lgi: lua bindings') +options=('!libtool') +source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz) +sha1sums=('53167d295ffa1d356bfad6f9360b90bd85e8fb26') + +build() { + cd keybinder-3.0-${pkgver} + ./configure --prefix=/usr --enable-gtk-doc + make +} + +package() { + cd keybinder-3.0-${pkgver} + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD index 901429d4c..b00ae9f5b 100644 --- a/extra/libmbim/PKGBUILD +++ b/extra/libmbim/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# $Id: PKGBUILD 188603 2013-06-16 20:32:24Z eric $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libmbim -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="MBIM modem protocol helper library" arch=(i686 x86_64) @@ -11,14 +11,8 @@ license=(GPL2) depends=(glib2 bash systemd) makedepends=(gtk-doc python) options=('!libtool') -source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) -sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' - 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../format.patch -} +source=(http://cgit.freedesktop.org/libmbim/libmbim/snapshot/$pkgname-$pkgver.tar.xz) +sha256sums=('0b00085486bb34b772e56643d6605eaffc3b2dd620485bc598cab8b0c6051825') build() { cd $pkgname-$pkgver diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch deleted file mode 100644 index 4bd4c0eea..000000000 --- a/extra/libmbim/format.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c ---- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 -+++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 -@@ -909,8 +909,8 @@ - "\t Network error: '%s'\n" - "\t Packet service state: '%s'\n" - "\tAvailable data classes: '%s'\n" -- "\t Uplink speed: '%lu bps'\n" -- "\t Downlink speed: '%lu bps'\n", -+ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" -+ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", - mbim_device_get_path_display (device), - VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), - VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index b354261ca..cb49d9877 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183300 2013-04-20 23:37:12Z foutrelis $ +# $Id: PKGBUILD 188592 2013-06-16 17:21:04Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens # Contributor: Sebastian Nowicki @@ -9,90 +9,48 @@ # Contributor: Roberto Alsina # Contributor: Gerardo Exequiel Pozzi -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.2 -pkgrel=6 +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/$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 +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 - cindexer-clang-path.patch - enable-lto.patch - llvm-3.1-fix-debug-line-info.patch - clang-3.2-fix-std-thread-with-libstdc++.patch - clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343' - '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658' - 'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1' + llvm-Config-llvm-config.h) +sha256sums=('68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578' + 'b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996' + '0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423' + '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' - '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' - '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - 'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b' - 'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d' - '02b2c0fd29bc165140eb4524700254bfdd88369706719acb3f3be3134f1e67e8' - '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') + '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48') prepare() { - cd "$srcdir/$pkgname-$pkgver.src" + 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/clang-$pkgver.src" tools/clang + mv "$srcdir/cfe-$pkgver.src" tools/clang mv "$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 - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + # Fix docs installation directory + sed -i '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 - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix FS#34861: crash on apps built using C++11's std::thread - # http://llvm.org/bugs/show_bug.cgi?id=12730 - patch -d tools/clang -Np2 -i \ - "$srcdir/clang-3.2-fix-std-thread-with-libstdc++.patch" - - # Fix FS#29984: [clang] -coverage is broken - patch -d tools/clang -Np1 -i \ - "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" - - # Fix FS#31098: LLVM 3.1 produces invalid debug information - # http://llvm.org/bugs/show_bug.cgi?id=13211 - patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch" - - # Drop "svn" suffix from version string - sed -i 's/3\.2svn/3.2/g' configure - - # Prepare Python 2 override - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" + # 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/$pkgname-$pkgver.src" + cd "$srcdir/llvm-$pkgver.src" # Apply strip option to configure _optimized_switch="enable" @@ -101,34 +59,33 @@ build() { # Include location of libffi headers in CPPFLAGS CPPFLAGS+=" $(pkg-config --cflags libffi)" - # Use Python 2 - export PATH="$srcdir/python2-path:$PATH" - # Force the use of GCC instead of clang CC=gcc CXX=g++ \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib/llvm \ --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=('perl' 'libffi') + depends=("llvm-libs=$pkgver-$pkgrel" 'perl') - cd "$srcdir/$pkgname-$pkgver.src" + 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 @@ -138,27 +95,26 @@ package_llvm() { 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/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + rm "$pkgdir"/usr/{lib/libllvm*,share/doc/llvm/ocamldoc.tar.gz} # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + chmod -x "$pkgdir"/usr/lib/*.a # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" + 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 ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" + 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) @@ -175,12 +131,22 @@ package_llvm() { 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" + 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') @@ -210,12 +176,16 @@ package_clang() { make DESTDIR="$pkgdir" install # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a + 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" } diff --git a/extra/llvm/cindexer-clang-path.patch b/extra/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/extra/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch deleted file mode 100644 index 080aa4fca..000000000 --- a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300 -@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } diff --git a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch b/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch deleted file mode 100644 index 6963603b1..000000000 --- a/extra/llvm/clang-3.2-fix-std-thread-with-libstdc++.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:51:36 178815 -+++ cfe/trunk/lib/Basic/Targets.cpp 2013/04/04 23:53:43 178816 -@@ -2730,6 +2730,14 @@ - case NoMMX3DNow: - break; - } -+ -+ if (CPU >= CK_i486) { -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2"); -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4"); -+ } -+ if (CPU >= CK_i586) -+ Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8"); - } - - bool X86TargetInfo::hasFeature(StringRef Feature) const { diff --git a/extra/llvm/clang-3.3-use-gold-linker.patch b/extra/llvm/clang-3.3-use-gold-linker.patch new file mode 100644 index 000000000..76905a64e --- /dev/null +++ b/extra/llvm/clang-3.3-use-gold-linker.patch @@ -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); + diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch deleted file mode 100644 index 9f43e657e..000000000 --- a/extra/llvm/enable-lto.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - // Tell the linker to load the plugin. This has to come before AddLinkerInputs - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - } - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - } diff --git a/extra/llvm/llvm-3.1-fix-debug-line-info.patch b/extra/llvm/llvm-3.1-fix-debug-line-info.patch deleted file mode 100644 index de2d46b61..000000000 --- a/extra/llvm/llvm-3.1-fix-debug-line-info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- - test/DebugInfo/X86/ending-run.ll | 6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { - if (!MI->isDebugValue()) { - DebugLoc DL = MI->getDebugLoc(); - if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { -- unsigned Flags = 0; -+ unsigned Flags = DWARF2_FLAG_IS_STMT; - PrevInstLoc = DL; - if (DL == PrologEndLoc) { - Flags |= DWARF2_FLAG_PROLOGUE_END; - PrologEndLoc = DebugLoc(); - } -- if (PrologEndLoc.isUnknown()) -- Flags |= DWARF2_FLAG_IS_STMT; -- - if (!DL.isUnknown()) { - const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); - recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s - --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. - --; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt --; CHECK: 0x0000000000000000 7 0 1 0 -+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt - ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end - - define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index bacb75045..8d4402ab9 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 184417 2013-05-06 19:39:02Z foutrelis $ +# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $ # Maintainer: # Contributor: Ronald van Haren # Contributor: Andries Radu pkgname=opengtl pkgver=0.9.18 -pkgrel=2 +pkgrel=3 pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" arch=('i686' 'x86_64') license=('GPL') -depends=('gcc-libs' 'llvm') -makedepends=('cmake' 'libpng') +depends=('gcc-libs' 'llvm-libs') +makedepends=('cmake' 'libpng' 'llvm') optdepends=('libpng: for using the png extension') source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 + opengtl-0.9.18-llvm-3.3.patch opengtl-0.9.18-memcpy.patch) sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + 'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c' '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') prepare() { mkdir build + + # Fix build with LLVM 3.3 (patch from Fedora) + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch" + + # Fix build with libpng 1.6 patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" } diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch new file mode 100644 index 000000000..80280979f --- /dev/null +++ b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch @@ -0,0 +1,732 @@ +diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt +--- OpenGTL-0.9.18/CMakeLists.txt.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/CMakeLists.txt 2013-05-08 15:39:25.090057193 -0400 +@@ -78,8 +78,8 @@ else(MSVC) + FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) + endif(MSVC) + +-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn" OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version +- message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.") ++if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version ++ message(FATAL_ERROR "LLVM 3.3 is required.") + endif() + + if(MSVC) +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -27,10 +27,10 @@ + #include + + // LLVM +-#include ++#include + // #include +-#include +-#include ++#include ++#include + // #include + // Library Loader + #ifdef LLVM_27_OR_28 +@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL + return success; + } + +-#include ++#include + + bool Compiler::importModule(const GTLCore::String& name) + { +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -19,9 +19,9 @@ + + #include "ParserNG.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + #include + #include +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -38,7 +38,7 @@ + using namespace OpenCTL; + + // LLVM +-#include ++#include + #include + #ifdef LLVM_27_OR_28 + #include +@@ -47,8 +47,7 @@ using namespace OpenCTL; + #include + #include + #endif +-#include +-#include ++#include + + struct Module::Private { + Private() : moduleData(0), isStandardLibrary(false) {} +diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp +--- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp 2013-05-08 15:39:25.091057197 -0400 +@@ -20,16 +20,16 @@ + #include "Program.h" + + // LLVM +-#include +-#include +-#include ++#include ++#include ++#include + #include + + // Passes + #include + #include + #include +-#include ++#include + + // GTLCore + #include "GTLCore/Buffer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -20,9 +20,9 @@ + #include "AccessorExpression.h" + + #include +-#include +-#include +-#include ++#include ++#include ++#include + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,7 +19,7 @@ + + #include "BinaryExpression.h" + +-#include ++#include + + #include + #include +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "CompoundExpression.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 +@@ -19,10 +19,10 @@ + + #include "ConstantCompoundExpression.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include "../LLVMBackend/CodeGenerator_p.h" + #include "../Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,11 +19,11 @@ + + #include "Expression.h" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -19,10 +19,10 @@ + + #include "FunctionDeclaration.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include + #include +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,8 +21,8 @@ + + #include + +-#include +-#include ++#include ++#include + + #include "../Type.h" + #include "../LLVMBackend/CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp 2013-05-08 15:39:25.093057205 -0400 +@@ -21,12 +21,12 @@ + + // LLVM + #include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + // GTLCore + #include +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -19,9 +19,9 @@ + + #include "Tree.h" + +-#include +-#include +-#include ++#include ++#include ++#include + + #include "FunctionDeclaration.h" + +@@ -37,8 +37,8 @@ + #include "GTLCore/LLVMBackend/Visitor_p.h" + + #include "Expression.h" +-#include +-#include ++#include ++#include + + using namespace GTLCore::AST; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -22,9 +22,9 @@ + #include + #include + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + +@@ -418,9 +418,9 @@ namespace GTLCore { + + #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT + +-#include +-#include +-#include ++#include ++#include ++#include + + void compareFunctionParameters( llvm::Value* func, const std::vector& params ) + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include + #include +-#include +- +-#include // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output ++#include ++#include ++#include // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output + + #include "VirtualMachine_p.h" + +@@ -35,7 +35,6 @@ + #include "LLVMBackend/GenerationContext_p.h" + #include "ModuleData_p.h" + #include "LLVMBackend/CodeGenerator_p.h" +-#include + #include "Type_p.h" + #include + #include "PrimitiveTypesTraits_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp 2013-05-08 15:39:25.094057209 -0400 +@@ -21,9 +21,9 @@ + + #include + +-#include +-#include +-#include ++#include ++#include ++#include + + #include "Parameter.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,12 +19,12 @@ + + #include "CodeGenerator_p.h" + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "GTLCore/Debug.h" + #include "ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ContextManager_p.h" + + #include +-#include ++#include + + using namespace LLVMBackend; + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -20,7 +20,7 @@ + #include "ExpressionGenerationContext_p.h" + + #include "GTLCore/Debug.h" +-#include ++#include + + #include "GTLCore/Macros_p.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 2013-05-08 15:39:25.095057213 -0400 +@@ -19,8 +19,8 @@ + + #include "ExpressionResult_p.h" + +-#include "llvm/Constant.h" +-#include "llvm/DerivedTypes.h" ++#include "llvm/IR/Constant.h" ++#include "llvm/IR/DerivedTypes.h" + + #include "../Type.h" + #include "../Type_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -22,8 +22,8 @@ + #include "GTLCore/ModuleData_p.h" + #include "GTLCore/Debug.h" + +-#include "llvm/BasicBlock.h" +-#include "llvm/Function.h" ++#include "llvm/IR/BasicBlock.h" ++#include "llvm/IR/Function.h" + + #include "GTLCore/AST/Statement.h" + +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -20,12 +20,12 @@ + #include "Visitor_p.h" + + // LLVM +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + // GTLCore + #include "CodeGenerator_p.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp 2013-05-08 15:41:21.422512114 -0400 +@@ -21,7 +21,7 @@ + + #include + +-#include ++#include + #include + #include + #include +@@ -242,7 +242,7 @@ void ModuleData::doLink() + GTL_ASSERT( not m_llvmLinkedModule ); + m_llvmLinkedModule = m_llvmModule; + m_llvmModule = llvm::CloneModule( m_llvmModule ); +- llvm::Linker linker("", m_llvmLinkedModule); ++ llvm::Linker linker(m_llvmLinkedModule); + std::string errorMessage; + foreach( const llvm::Module* mod, m_linkModuleWith ) + { +@@ -270,18 +270,11 @@ void ModuleData::doLink() + hide.push_back(name); + } + } +- linker.LinkInModule( clone, &errorMessage ); ++ linker.linkInModule( clone, &errorMessage ); + + GTL_DEBUG("Linking error: " << errorMessage ); + delete clone; + } +- foreach( const GTLCore::String& mod, m_linkModuleWithArchives ) +- { +- bool v = false; +- linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v); +- } +- +- linker.releaseModule(); + + // Hide symbols + foreach(GTLCore::String name, hide) +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp 2013-05-08 15:39:25.096057217 -0400 +@@ -25,7 +25,7 @@ + + #include + +-#include ++#include + + #include "wrappers/StructWrap.h" + #include "SharedPointer.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -30,8 +30,8 @@ + + using namespace GTLCore; + +-#include +-#include ++#include ++#include + + Type::StructDataMember::Information::~Information() + { +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "Value_p.h" + +-#include +-#include ++#include ++#include + + #include "Debug.h" + #include "Value.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,8 +19,8 @@ + + #include "VariableNG_p.h" + +-#include +-#include ++#include ++#include + + #include "LLVMBackend/CodeGenerator_p.h" + #include "Debug.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -21,10 +21,10 @@ + + // JIT + #include +-#include +-#include ++#include ++#include + #include +-#include ++#include + #include + #include + #include +@@ -48,7 +48,8 @@ struct VirtualMachine::Private { + VirtualMachine* VirtualMachine::Private::virtualMachine = 0; + int VirtualMachine::Private::optimLevel = 2; + +-void gtl_llvm_error_handler(void *user_data, const std::string& reason) ++void gtl_llvm_error_handler(void *user_data, const std::string& reason, ++ bool gen_crash_diag) + { + GTL_ABORT(reason); + } +@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new + { + d->executionEngine = 0; + +-#ifdef LLVM_27 +- llvm::llvm_install_error_handler(>l_llvm_error_handler); +-#else +- llvm::install_fatal_error_handler(>l_llvm_error_handler); +-#endif ++ llvm::install_fatal_error_handler(gtl_llvm_error_handler); + + llvm::llvm_start_multithreaded(); + +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp 2013-05-08 15:39:25.097057221 -0400 +@@ -19,7 +19,7 @@ + + #include "Compiler_p.h" + +-#include ++#include + #include + + #include "GTLCore/AST/Expression.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -22,9 +22,9 @@ + + #include + +-#include ++#include + #include +-#include ++#include + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp +--- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -29,7 +29,7 @@ + + #include "Library.h" + #include +-#include ++#include + #include + + using namespace GTLFragment; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -21,14 +21,14 @@ + + #include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "GTLCore/LLVMBackend/CodeGenerator_p.h" + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 2013-05-08 15:39:25.098057225 -0400 +@@ -28,13 +28,13 @@ + #include "CodeGenerator_p.h" + #include + #include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + #include + #include +-#include ++#include + #include + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,7 +22,7 @@ + #include + #include + +-#include ++#include + + #include "GTLCore/CompilationMessage.h" + #include "GTLCore/Function.h" +@@ -48,7 +48,7 @@ + #include "wrappers/ImageWrap_p.h" + #include "wrappers/RegionWrap_p.h" + #include +-#include ++#include + + using namespace OpenShiva; + +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -19,7 +19,8 @@ + + #include "PixelConvertExpressionFactory_p.h" + +-#include ++#include ++#include + + #include "GTLCore/Type.h" + #include "GTLCore/AST/ConvertExpression.h" +@@ -34,7 +35,6 @@ + #include + #include + #include +-#include + #include + + using namespace OpenShiva; +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -20,11 +20,11 @@ + #include "PixelVisitor_p.h" + + // LLVM +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include "GTLCore/LLVMBackend/ExpressionResult_p.h" + #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h" +diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp +--- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 ++++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp 2013-05-08 15:39:25.099057228 -0400 +@@ -22,9 +22,9 @@ + #include + #include + +-#include +-#include +-#include ++#include ++#include ++#include + + #include "GTLCore/Function_p.h" + #include "GTLCore/Macros.h" -- cgit v1.2.3-54-g00ecf