Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=765af45e3cc374b23a6bdf91632097fbbaafd4e9
commit 765af45e3cc374b23a6bdf91632097fbbaafd4e9 Author: DeX77 <[email protected]> Date: Sun Mar 8 19:44:58 2015 +0100 llvm-3.6.0-3-x86_64 * fix link time gcc dependecies diff --git a/source/devel/llvm/FrugalBuild b/source/devel/llvm/FrugalBuild index 8d41054..c70b7f2 100644 --- a/source/devel/llvm/FrugalBuild +++ b/source/devel/llvm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=llvm pkgver=3.6.0 -pkgrel=2 +pkgrel=3 gcc_ver=4.9.2 url="http://www.llvm.org"; pkgdesc="Low Level Virtual Machine (Compiler , Tools and Libs)" @@ -14,10 +14,11 @@ groups=('devel') archs=('i686' 'x86_64' 'arm') up2date="Flastarchive $url/releases/download.html .src.tar.xz" source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.xz \ - http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz ) + http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz \ + fix-lib-path.patch) _F_archive_ver="${pkgver}.src" _F_make_opts="${MAKEFLAGS} REQUIRES_RTTI=1" -signatures=("${source[0]}.sig" "${source[1]}.sig") +signatures=("${source[0]}.sig" "${source[1]}.sig" "") subpkgs=("${subpkgs[@]}" "clang") subdescs=("${subdescs[@]}" "C language family frontend for LLVM") @@ -33,6 +34,18 @@ subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subgroups=("${subgroups[@]}" 'devel-extra') subarchs=("${subarchs[@]}" "${archs[*]}") + +c_include_dirs="/usr/local/include:/usr/include/c++/${gcc_ver}:/usr/include/c++/${gcc_ver}/backward:/usr/include/c++/${gcc_ver}/${CARCH}-frugalware-linux:/usr/include" + +Fconfopts+="--libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --with-c-include-dirs=${c_include_dirs} \ + --with-cxx-include-arch=${CARCH}-frugalware-linux \ + --build=${CARCH}-frugalware-linux" + build() { Fcd # clang must be copied here to build with llvm @@ -47,14 +60,8 @@ build() { Fsed '\${prefix}/etc/llvm' '/etc/llvm' configure export CC='gcc' export CXX='g++' - Fmake --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --with-c-include-dirs=/usr/local/include:/usr/include/c++/${gcc_ver}:/usr/include/c++/${gcc_ver}/backward:/usr/include/c++/${gcc_ver}/${CARCH}-frugalware-linux:/usr/include \ - --with-cxx-include-arch=${CARCH}-frugalware-linux \ - --$_optimized_switch-optimized + Fmake --$_optimized_switch-optimized + Fexec make -C docs -f Makefile.sphinx man Fexec make -C docs -f Makefile.sphinx html diff --git a/source/devel/llvm/fix-lib-path.patch b/source/devel/llvm/fix-lib-path.patch new file mode 100644 index 0000000..3019a57 --- /dev/null +++ b/source/devel/llvm/fix-lib-path.patch @@ -0,0 +1,21 @@ +--- llvm-3.6.0.src/tools/clang/lib/Driver/ToolChains.cpp 2015-02-18 22:03:07.000000000 +0100 ++++ llvm-3.6.0.src.new/tools/clang/lib/Driver/ToolChains.cpp 2015-03-08 14:55:50.000000000 +0100 +@@ -1308,7 +1308,7 @@ + "x86_64-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu", + "x86_64-redhat-linux6E", "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux", +- "x86_64-linux-android", "x86_64-unknown-linux" ++ "x86_64-linux-android", "x86_64-unknown-linux", "x86_64-frugalware-linux" + }; + static const char *const X32LibDirs[] = { "/libx32" }; + static const char *const X86LibDirs[] = { "/lib32", "/lib" }; +@@ -1316,7 +1316,8 @@ + "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", "i386-linux-gnu", + "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux", + "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux", +- "i686-montavista-linux", "i686-linux-android", "i586-linux-gnu" ++ "i686-montavista-linux", "i686-linux-android", "i586-linux-gnu", ++ "i686-frugalware-linux" + }; + + static const char *const MIPSLibDirs[] = { "/lib" }; \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
