Mon Dec 31 01:32:43 PST 2012

4 files changed, 86 insertions, 32 deletions

diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 271602b72..8792ca4fd 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171485 2012-11-18 02:09:02Z foutrelis $
+# $Id: PKGBUILD 173973 2012-12-30 15:30:36Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -10,12 +10,12 @@
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.1
-pkgrel=6
+pkgver=3.2
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml')
+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
@@ -25,19 +25,17 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
-        clang-3.1-fix-libprofile_rt.a-location.patch
-        clang-3.1-fix-lwg-2141.patch)
-sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
-            'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
-            '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
+        clang-3.1-fix-libprofile_rt.a-location.patch)
+sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343'
+            '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658'
+            'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
-            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
+            'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
-            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137'
-            'a3ac405a983643c9cb9081692a3f4d28e5d19571fa12b0517fb2b1f2acab0ad0')
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
@@ -83,13 +81,13 @@ build() {
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
-  # Fix FS#32731: [clang] 3.1 fails to compile libstdc++ <chrono> 4.7.2
-  patch -d tools/clang -Np0 -i "$srcdir/clang-3.1-fix-lwg-2141.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
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
@@ -118,6 +116,8 @@ build() {
     --$_optimized_switch-optimized
 
   make REQUIRES_RTTI=1
+  make -C docs -f Makefile.sphinx man
+  make -C docs -f Makefile.sphinx html
 }
 
 package_llvm() {
@@ -166,6 +166,14 @@ package_llvm() {
     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/llvm/html/"
+  rm -r "$pkgdir/usr/share/doc/llvm/html/_sources"
+
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch
index 3205fbf69..9f43e657e 100644
--- a/extra/llvm/enable-lto.patch
+++ b/extra/llvm/enable-lto.patch
@@ -19,14 +19,12 @@ Index: lib/Driver/Tools.cpp
    // 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)) {
-+  // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
+   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/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index fd46570ce..227a66368 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,32 +1,42 @@
-# $Id: PKGBUILD 169817 2012-10-30 10:47:49Z foutrelis $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# $Id: PKGBUILD 173974 2012-12-30 15:30:38Z foutrelis $
+# Maintainer:
+# Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
 pkgver=0.9.17
-pkgrel=1
-pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
+pkgrel=2
+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')
 optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-sha1sums=('10369bd11109312466389b3b050469dd69e54d2b')
+source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2
+        opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch)
+sha256sums=('89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e'
+            'd3e12d964c927e6f659df00e6210815c803c9126b34e9e92d4ccfebd6d30c8d7')
 
 build() {
-  cd "${srcdir}"
+  cd "$srcdir"
+
+  #  Fix build with LLVM 3.2
+  patch -d OpenGTL-$pkgver -Np1 -i \
+    "$srcdir/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch"
+
   mkdir build
   cd build
-  cmake ../OpenGTL-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+  cmake ../OpenGTL-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON
   make
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
new file mode 100644
index 000000000..c148c88bb
--- /dev/null
+++ b/extra/opengtl/opengtl-0.9.17-fix-ftbfs-with-llvm-3.2.patch
@@ -0,0 +1,38 @@
+diff -upr OpenGTL-0.9.17.orig/CMakeLists.txt OpenGTL-0.9.17/CMakeLists.txt
+--- OpenGTL-0.9.17.orig/CMakeLists.txt	2012-06-04 17:51:43.000000000 +0300
++++ OpenGTL-0.9.17/CMakeLists.txt	2012-12-25 03:00:30.000000000 +0200
+@@ -47,8 +47,8 @@ configure_file(config-endian.h.cmake ${C
+ 
+ find_package(LLVM REQUIRED)
+ 
+-if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" ) ) # There is no way with MSVC to know the llvm version
+-  message(FATAL_ERROR "LLVM 3.0 or 3.1 is required.")
++if( NOT MSVC AND NOT LLVM_VERSION STREQUAL "3.2" ) # There is no way with MSVC to know the llvm version
++  message(FATAL_ERROR "LLVM 3.2 is required.")
+ endif()
+ 
+ if(MSVC)
+diff -upr OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp
+--- OpenGTL-0.9.17.orig/OpenCTL/OpenCTL/Program.cpp	2012-06-04 17:51:43.000000000 +0300
++++ OpenGTL-0.9.17/OpenCTL/OpenCTL/Program.cpp	2012-12-25 02:59:17.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include <llvm/PassManager.h>
+ #include <llvm/Analysis/LoopPass.h>
+ #include <llvm/Analysis/Verifier.h>
+-#include <llvm/Target/TargetData.h>
++#include <llvm/DataLayout.h>
+ #include <llvm/GlobalVariable.h>
+ 
+ // GTLCore
+diff -upr OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp
+--- OpenGTL-0.9.17.orig/OpenGTL/GTLCore/ModuleData_p.cpp	2012-06-04 17:51:43.000000000 +0300
++++ OpenGTL-0.9.17/OpenGTL/GTLCore/ModuleData_p.cpp	2012-12-25 02:59:34.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ #include <llvm/Module.h>
+ #include <llvm/PassManager.h>
+-#include <llvm/Target/TargetData.h>
++#include <llvm/DataLayout.h>
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Analysis/Verifier.h>
+ #include <llvm/Transforms/Utils/Cloning.h>