From 693b5793b8c615601135bc04216a2ca0966087c5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Apr 2011 22:32:36 +0000 Subject: Fri Apr 29 22:32:36 UTC 2011 --- extra/curl/PKGBUILD | 11 +- extra/kismet/PKGBUILD | 18 +- extra/llvm/PKGBUILD | 225 +++++++++++++++++++++++++ extra/llvm/cindexer-clang-path.patch | 10 ++ extra/llvm/clang-plugin-loader-registry.patch | 11 ++ extra/llvm/clang-pure64.patch | 38 +++++ extra/llvm/clang-toolchains-gcc-versions.patch | 12 ++ extra/llvm/enable-lto.patch | 36 ++++ extra/openmpi/PKGBUILD | 4 +- extra/python-cairo/PKGBUILD | 14 +- 10 files changed, 355 insertions(+), 24 deletions(-) create mode 100644 extra/llvm/PKGBUILD create mode 100644 extra/llvm/cindexer-clang-path.patch create mode 100644 extra/llvm/clang-plugin-loader-registry.patch create mode 100644 extra/llvm/clang-pure64.patch create mode 100644 extra/llvm/clang-toolchains-gcc-versions.patch create mode 100644 extra/llvm/enable-lto.patch (limited to 'extra') diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index 06fe3ab42..2e1f2dd4e 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 110504 2011-02-19 17:12:53Z angvp $ +# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $ # Maintainer: Angel Velasquez # Contributor: Eric Belanger # Contributor: Lucien Immink # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.21.4 -pkgrel=2 +pkgver=7.21.6 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -15,11 +15,12 @@ depends=('zlib' 'openssl' 'bash' 'ca-certificates') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 curlbuild.h) -md5sums=('e2dd20c88a7d01c745af9d788545ab2a' - '751bd433ede935c8fae727377625a8ae') [[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h [[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h +md5sums=('6611989a81ebd7b03a35adc3001ddee0' + '751bd433ede935c8fae727377625a8ae') + build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index b381469ad..3333a8e22 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94735 2010-10-10 15:05:47Z guillaume $ +# $Id: PKGBUILD 119587 2011-04-12 15:18:27Z angvp $ # Contributer: Jason Chu # Maintainer: Juergen Hoetzel pkgname=kismet -pkgver=2010_07_R1 +pkgver=2011_03_R2 _realver="${pkgver//_/-}" pkgrel=1 pkgdesc="802.11b sniffing software" @@ -15,24 +15,24 @@ url="http://www.kismetwireless.net/" backup=('etc/kismet.conf' 'etc/kismet_drone.conf') options=('!makeflags') source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz) -md5sums=('85e59186eb529889118b5635f35cf57d') +md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') build() { cd "$srcdir/kismet-$_realver" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var || return 1 + --localstatedir=/var - make dep || return 1 - make || return 1 - sed -i 's/prism2/wlanng/g' conf/kismet.conf || return 1 - make DESTDIR="$pkgdir" install || return 1 + make dep + make + sed -i 's/prism2/wlanng/g' conf/kismet.conf + make DESTDIR="$pkgdir" install chown root:root "$pkgdir"/usr/share/man/man{1,5}/* install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README" # Fix the *.conf unexpanded ${prefix} problems - sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf || return 1 + sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf } diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD new file mode 100644 index 000000000..3587a7775 --- /dev/null +++ b/extra/llvm/PKGBUILD @@ -0,0 +1,225 @@ +# $Id: PKGBUILD 121057 2011-04-28 21:09:26Z heftig $ +# Maintainer: Evangelos Foutras +# Contributor: Jan "heftig" Steffens +# Contributor: Sebastian Nowicki +# Contributor: Devin Cofer +# Contributor: Tobias Kieslich +# Contributor: Geoffroy Carrier +# Contributor: Tomas Lindquist Olsen +# Contributor: Roberto Alsina +# Contributor: Gerardo Exequiel Pozzi + +pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') +pkgver=2.9 +_gcc_ver=4.6.0 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://llvm.org/" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz + http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz + clang-plugin-loader-registry.patch + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch) +md5sums=('793138412d2af2c7c7f54615f8943771' + '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' + '02c23b4aaca3445b8bf39fddb2f9906e' + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '8da236120a9a287a977b575b8b905c93' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4') + +build() { + cd "$srcdir/$pkgname-$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 + rm -rf tools/clang + cp -r "$srcdir/clang-$pkgver" tools/clang + + # 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:' \ + Makefile.config.in + + # 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" + + # Add GCC 4.6.0 to GccVersions (FS#23631) + patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + if [[ $CARCH == x86_64 ]]; then + # Adjust lib paths + patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + fi + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + + # 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)" + + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package_llvm() { + pkgdesc="Low Level Virtual Machine" + depends=('perl' 'libffi') + + cd "$srcdir/$pkgname-$pkgver" + + # 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 + mv "$srcdir/clang" tools + + # 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} + + # 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.* + + # Symlink the gold plugin where clang expects it + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" + + # 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" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm-ocaml() { + pkgdesc="OCaml bindings for LLVM" + depends=("llvm=$pkgver-$pkgrel" 'ocaml') + + cd "$srcdir/llvm-$pkgver" + + install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} + cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" + cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" + + # Remove execute bit from static libraries + chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" +} + +package_clang() { + pkgdesc="C language family frontend for LLVM" + url="http://clang.llvm.org/" + # It looks like clang still needs GCC to assemble and link object files + # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html + depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") + + # Fix installation path for clang docs + sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ + "$srcdir/llvm-$pkgver/Makefile.config" + + cd "$srcdir/llvm-$pkgver/tools/clang" + make DESTDIR="$pkgdir" install + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib/llvm/*.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/Makefile.config" + + # Install old libstdc++ headers. Contains combined headers from + # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 + install -d "$pkgdir/usr/include/c++" + cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" +} + +package_clang-analyzer() { + pkgdesc="A source code analysis framework" + url="http://clang-analyzer.llvm.org/" + depends=("clang=$pkgver-$pkgrel" 'python2') + + cd "$srcdir/llvm-$pkgver/tools/clang" + + install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} + for _tool in scan-{build,view}; do + cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" + ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" + done + + # Use Python 2 + sed -i 's/env python$/\02/' \ + "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ + "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" + + # Compile Python scripts + python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" + python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/llvm/cindexer-clang-path.patch b/extra/llvm/cindexer-clang-path.patch new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/extra/llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- 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-plugin-loader-registry.patch b/extra/llvm/clang-plugin-loader-registry.patch new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/extra/llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +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: *; + }; diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/extra/llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +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) && diff --git a/extra/llvm/clang-toolchains-gcc-versions.patch b/extra/llvm/clang-toolchains-gcc-versions.patch new file mode 100644 index 000000000..2e527300d --- /dev/null +++ b/extra/llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +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"}; diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/extra/llvm/enable-lto.patch @@ -0,0 +1,36 @@ +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)); + } diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index f08d2a4e3..32d538665 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115803 2011-03-21 16:10:23Z stephane $ +# $Id: PKGBUILD 121049 2011-04-28 16:03:46Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=openmpi pkgver=1.5.3 -pkgrel=2 +pkgrel=3 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD index 864c6bb86..458bfca4d 100644 --- a/extra/python-cairo/PKGBUILD +++ b/extra/python-cairo/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 110756 2011-02-22 02:50:48Z stephane $ +# $Id: PKGBUILD 121116 2011-04-29 03:02:02Z angvp $ +# Maintainer: Angel Velasquez # Maintainer: Jan de Groot pkgname=python-cairo -pkgver=1.8.10 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="Python bindings for the cairo graphics library" arch=('i686' 'x86_64') license=('LGPL3') depends=('python' 'cairo') makedepends=('pkg-config') options=('!libtool') -source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2 - pycairo-1.8.10-pypath.patch) +source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) url="http://www.cairographics.org/pycairo" -md5sums=('ddc544943d791e3c22ca8f019e10e1e3' - '047cfe0a98cfa73a156cd70e70082325') +md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') build() { cd "${srcdir}/pycairo-${pkgver}" @@ -31,7 +30,6 @@ build() { # Patch the unpacked version of waf: pushd .waf3* - patch -Np0 -i ../../pycairo-1.8.10-pypath.patch popd ./waf configure --prefix=/usr -- cgit v1.2.3-54-g00ecf