Upgrading lib32-llvm to 3.1 to match what's in platform-testing.

Also removed all the patches, so that the PKGBUILDs are aligned.

lib32-llvm/PKGBUILD

@@ -4,37 +4,38 @@
 # maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
 pkgname=('lib32-llvm')
-pkgver=3.0
+pkgver=3.1
 pkgrel=1
 arch=('x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('lib32-libffi' 'python2' 'gcc-multilib' 'groff')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477')
+source=("http://llvm.org/releases/${pkgver}/llvm-${pkgver}.src.tar.gz")
+md5sums=('16eaa7679f84113f65b12760fdfe4ee1')
 
 build() {
-  cd "$srcdir/llvm-$pkgver.src"
+  cd "${srcdir}/llvm-${pkgver}.src"
 
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   # 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)/lib32/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
+  sed -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
+      -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \
+      -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
+      -i Makefile.config.in
 
   # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+  sed -e 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' \
+      -i Makefile.rules
 
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
 
   # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
+  export CPPFLAGS="${CPPFLAGS} $(pkg-config --cflags libffi)"
 
   ./configure \
     --prefix=/usr \
@@ -48,44 +49,46 @@ build() {
     --disable-assertions \
     --with-binutils-include=/usr/include \
     --with-cxx-include-arch=$CHOST \
-    --$_optimized_switch-optimized
+    "--${_optimized_switch}-optimized"
 
   make REQUIRES_RTTI=1
 }
 
 package() {
-  pkgdesc="Low Level Virtual Machine (32 bits version)"
-  depends=('perl' 'lib32-libffi' 'llvm')
+pkgdesc="Low Level Virtual Machine (32 bits version)"
+depends=('perl' 'lib32-libffi' 'llvm')
 
-  cd "$srcdir/llvm-$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
   # mv tools/clang "$srcdir"
   # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
+  make -j1 DESTDIR="${pkgdir}" install
 
   # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib32/llvm/*.a
+  chmod -x "${pkgdir}"/usr/lib32/llvm/*.a
 
   # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config"
-  mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config"
+  sed -e 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' \
+      -i "${pkgdir}/usr/bin/llvm-config"
+  mv "${pkgdir}/usr/bin/llvm-config" "${pkgdir}/usr/lib32/llvm-config"
 
   # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
+  rm "${pkgdir}"/usr/lib32/llvm/*LLVMHello.*
 
   # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
+  ln -s llvm/LLVMgold.so "${pkgdir}/usr/lib32/LLVMgold.so"
 
   # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo /usr/lib32/llvm >"${pkgdir}/etc/ld.so.conf.d/llvm32.conf"
 
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 LICENSE.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
-  mkdir "$pkgdir"/usr/bin
-  mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32"
+  rm -r "${pkgdir}"/usr/{bin,include,share/{doc,man}}
+  mkdir "${pkgdir}"/usr/bin
+  mv "${pkgdir}/usr/lib32/llvm-config" "${pkgdir}/usr/bin/llvm-config32"
 }
 
+# vim:set ts=2 sw=2 et:

lib32-llvm/cindexer-clang-path.patch

@@ -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");

lib32-llvm/clang-plugin-loader-registry.patch

@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };

lib32-llvm/clang-pure64.patch

@@ -1,38 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::arm)
-       CmdArgs.push_back("/lib/ld-linux.so.3");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1317,18 +1317,10 @@
-   if (Arch == llvm::Triple::x86)
-     Suffix64 = "/64";
- 
--  std::string Lib32 = "lib";
--
--  bool Exists;
--  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
--    Lib32 = "lib32";
--
-+  std::string Lib32 = "lib32";
-   std::string Lib64 = "lib";
--  bool Symlink;
--  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
--      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
--    Lib64 = "lib64";
- 
-+  bool Exists;
-   std::string GccTriple = "";
-   if (Arch == llvm::Triple::arm) {
-     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&

lib32-llvm/clang-toolchains-gcc-versions.patch

@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
-       GccTriple = "i586-suse-linux";
-   }
- 
--  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
-                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
-                                "4.2"};

lib32-llvm/enable-lto.patch

@@ -1,36 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,11 +1398,11 @@
-     Lib = Lib64;
-   }
- 
--  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
-+  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
-   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
-     Linker = LinkerPath.str();
-   else
--    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 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
-     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }