Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=mcirstabumps.git;a=commitdiff;h=76e2ce8a262eb4ed93e8ca6150a27f8361f665cb
commit 76e2ce8a262eb4ed93e8ca6150a27f8361f665cb Author: Marius Cirsta <[email protected]> Date: Tue Jan 28 17:47:24 2014 +0200 llvm-3.4-1-x86_64 * version bump diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild index 425491e..10efe31 100644 --- a/source/devel/llvm/FrugalBuild +++ b/source/devel/llvm/FrugalBuild @@ -2,11 +2,11 @@ # Maintainer: Marius Cirsta <[email protected]> pkgname=llvm -pkgver=3.2 -pkgrel=5 +pkgver=3.4 +pkgrel=1 url="http://www.llvm.org"; pkgdesc="Low Level Virtual Machine (Compiler , Tools and Libs)" -gcc_ver="4.7.2" +gcc_ver="4.8.2" depends=('libstdc++' "gcc=$gcc_ver") makedepends=('groff' 'libffi' 'python' 'ocaml') groups=('devel') @@ -15,12 +15,12 @@ up2date="Flastarchive $url/releases/download.html .src.tar.gz" source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz \ http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz \ path-fix.patch fix-include-path.patch) -_F_cd_path=${pkgname}-${pkgver}.src +_F_cd_path=${pkgname}-${pkgver} _F_make_opts="${MAKEFLAGS} REQUIRES_RTTI=1" -sha1sums=('42d139ab4c9f0c539c60f5ac07486e9d30fc1280' \ - 'b0515298c4088aa294edc08806bd671f8819f870' \ +sha1sums=('10b1fd085b45d8b19adb9a628353ce347bc136b8' \ + 'a6a3c815dd045e9c13c7ae37d2cfefe65607860d' \ '9b4d212f4cea66982bc21d73aac248543f1ca6c5' \ - '4b4cabc7c4ebf94a97335c05174cc482d2658588') + '231969fcc595642a3478cc4af7a0ea5ce14306d5') subpkgs=("${subpkgs[@]}" "clang") subdescs=("${subdescs[@]}" "C language family frontend for LLVM") @@ -38,7 +38,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') build() { # clang must be copied here to build with llvm - mv ./clang-${pkgver}.src/ ./${_F_cd_path}/tools/clang || Fdie + mv -f ./clang-${pkgver}/ ./${_F_cd_path}/tools/clang || Fdie Fpatchall #Apply strip option to configure @@ -46,8 +46,6 @@ build() { [[ $(check_option strip) == n ]] && _optimized_switch="disable" Fsed '\${prefix}/etc/llvm' '/etc/llvm' configure - Fsed '3.2svn' '3.2' configure - Fsed '3.2svn' '3.2' autoconf/configure.ac export CC='gcc' export CXX='g++' Fmake --libdir=/usr/lib/llvm \ diff --git a/source/devel/llvm/fix-include-path.patch b/source/devel/llvm/fix-include-path.patch index 349b77a..490734e 100644 --- a/source/devel/llvm/fix-include-path.patch +++ b/source/devel/llvm/fix-include-path.patch @@ -1,16 +1,16 @@ ---- llvm-3.2.src.old/tools/clang/lib/Driver/ToolChains.cpp 2012-12-16 17:59:27.000000000 +0200 -+++ llvm-3.2.src.new/tools/clang/lib/Driver/ToolChains.cpp 2013-01-08 02:38:19.000000000 +0200 -@@ -2228,8 +2228,12 @@ +--- llvm-3.4/tools/clang/lib/Driver/ToolChains.cpp 2013-12-02 12:00:07.000000000 +0200 ++++ llvm-3.4.new/tools/clang/lib/Driver/ToolChains.cpp 2014-01-28 16:23:26.830558182 +0200 +@@ -2586,8 +2586,12 @@ if (DriverArgs.hasArg(options::OPT_nostdinc)) return; - if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) + if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) { - addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -+ addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include/c++/4.7.2"); -+ addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include/c++/4.7.2/x86_64-frugalware-linux"); -+ addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include/c++/4.7.2/i686-frugalware-linux"); + addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include"); ++ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include/c++/4.8.2"); ++ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include/c++/4.8.2/x86_64-frugalware-linux"); ++ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include/c++/4.8.2/i686-frugalware-linux"); + } if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); + SmallString<128> P(D.ResourceDir); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
