summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-07 17:32:13 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-07 17:32:13 (GMT)
commit0116e098392a84a7cdc5b7926c5e8b350568fb27 (patch)
tree048a63e2564cf0c17f61739011eb9fe23ab2ceef
parentf743a5cead68421ee4c8d2bfe3a0922810475425 (diff)
downloadlinhes_pkgbuild-0116e098392a84a7cdc5b7926c5e8b350568fb27.zip
linhes_pkgbuild-0116e098392a84a7cdc5b7926c5e8b350568fb27.tar.gz
linhes_pkgbuild-0116e098392a84a7cdc5b7926c5e8b350568fb27.tar.bz2
llvm: removed
-rw-r--r--abs/core/llvm/PKGBUILD231
-rw-r--r--abs/core/llvm/bug-9869-operator-h-c++0x.patch57
-rw-r--r--abs/core/llvm/cindexer-clang-path.patch10
-rw-r--r--abs/core/llvm/clang-plugin-loader-registry.patch11
-rw-r--r--abs/core/llvm/clang-pure64.patch38
-rw-r--r--abs/core/llvm/clang-toolchains-gcc-versions.patch12
-rw-r--r--abs/core/llvm/enable-lto.patch36
7 files changed, 0 insertions, 395 deletions
diff --git a/abs/core/llvm/PKGBUILD b/abs/core/llvm/PKGBUILD
deleted file mode 100644
index 2221832..0000000
--- a/abs/core/llvm/PKGBUILD
+++ /dev/null
@@ -1,231 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=2.9
-_gcc_ver=4.5.1
-pkgrel=6
-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
- bug-9869-operator-h-c++0x.patch)
-md5sums=('793138412d2af2c7c7f54615f8943771'
- '634de18d04b7a4ded19ec4c17d23cfca'
- '70e23a3dc2b38ecb2bb4d2c48f47295d'
- '02c23b4aaca3445b8bf39fddb2f9906e'
- '87a7162dbe99e9ffce6c40bd09f5f4f0'
- '016d70145d52255c9a46fedde51634e2'
- '225ee6b531f8327f34f344a18cb4ec81'
- '8f7582d7440e4a8342c3aea9ec714fb4'
- '047cac563a557463d7ec6bd87d953f5e')
-
-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.1 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"
-
- # Fix upstream bug #9869:
- # Operator.h incompatibility with GCC 4.6 in C++0x mode
- patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.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/abs/core/llvm/bug-9869-operator-h-c++0x.patch b/abs/core/llvm/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index b95d7d7..0000000
--- a/abs/core/llvm/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006
-+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062
-@@ -186,28 +186,46 @@
- };
-
- class AddOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+ ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+ ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+ ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+ ~ShlOperator(); // DO NOT IMPLEMENT
-+};
-
-
- class SDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+ ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+ ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+ ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+ ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-
-
-
- class GEPOperator
- : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+ ~GEPOperator(); // DO NOT IMPLEMENT
-+
- enum {
- IsInBounds = (1 << 0)
- };
diff --git a/abs/core/llvm/cindexer-clang-path.patch b/abs/core/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab69..0000000
--- a/abs/core/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/abs/core/llvm/clang-plugin-loader-registry.patch b/abs/core/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9f..0000000
--- a/abs/core/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -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: *;
- };
diff --git a/abs/core/llvm/clang-pure64.patch b/abs/core/llvm/clang-pure64.patch
deleted file mode 100644
index da61785..0000000
--- a/abs/core/llvm/clang-pure64.patch
+++ /dev/null
@@ -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) &&
diff --git a/abs/core/llvm/clang-toolchains-gcc-versions.patch b/abs/core/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 7e00837..0000000
--- a/abs/core/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -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.1", "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/abs/core/llvm/enable-lto.patch b/abs/core/llvm/enable-lto.patch
deleted file mode 100644
index 40d9310..0000000
--- a/abs/core/llvm/enable-lto.patch
+++ /dev/null
@@ -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));
- }