diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-21 07:05:26 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-21 07:07:16 +0000 |
| commit | 3b88861b21d5ebf0b4bf58588c4bc175575859ee (patch) | |
| tree | 0990806a0aec0d1f215a74ead088cfa821b77d9b /main/llvm | |
| parent | 13736bfe6e81856e847e701eb468d5e3d0d41c76 (diff) | |
| download | aports-3b88861b21d5ebf0b4bf58588c4bc175575859ee.tar.bz2 aports-3b88861b21d5ebf0b4bf58588c4bc175575859ee.tar.xz | |
main/llvm: fix linking on x86_64
Patch from Dubiousjim.
ref #1915
Diffstat (limited to 'main/llvm')
| -rw-r--r-- | main/llvm/APKBUILD | 12 | ||||
| -rw-r--r-- | main/llvm/llvm-3.2-alpine-linux.patch | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/main/llvm/APKBUILD b/main/llvm/APKBUILD index 798a2a438d..77f9a2742c 100644 --- a/main/llvm/APKBUILD +++ b/main/llvm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=llvm pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc="low level virtual machine compiler system" arch="x86 x86_64" url="http://llvm.org/" @@ -16,6 +16,9 @@ source="http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz llvm-3.2-alpine-linux.patch " +# clang hardcodes linker paths; and don't know of a fix like the --with-dynamic-linker +# patch we use for gcc. So llvm-3.2-alpine-linux.patch needs to be updated if/when the +# uClibc ABI version (as of uClibc 0.9.33.2, this is 0.9.32) increases. _builddir="$srcdir"/build @@ -59,7 +62,6 @@ build() { --enable-ffi \ --enable-shared \ || return 1 - # --build="$CBUILD" --host="$CHOST" --target="$CTARGET" \ # configure gets it wrong. We do have error_t sed -i -e 's/.*undef HAVE_ERROR_T.*/#define HAVE_ERROR_T 1/' \ @@ -100,10 +102,10 @@ libs() { md5sums="71610289bbc819e3e15fdd562809a2d7 llvm-3.2.src.tar.gz 3896ef4334df08563b05d0848ba80582 clang-3.2.src.tar.gz -7c35c098d3f18bdf48d19ec889e22140 llvm-3.2-alpine-linux.patch" +3014842ee498ffe044773ef3a7f859ca llvm-3.2-alpine-linux.patch" sha256sums="125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 llvm-3.2.src.tar.gz 2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658 clang-3.2.src.tar.gz -5a16f907107781b4942714cf9d5e6ffcd21024f9f601f7b7dfb17108a62080d0 llvm-3.2-alpine-linux.patch" +0496f84b97131b393662f4031bf7e117caaa29702bea569e8d4d783093c3067f llvm-3.2-alpine-linux.patch" sha512sums="cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc llvm-3.2.src.tar.gz 99fc57d19b76c42af9821eaaa762056a926eb68178f6b7dd5e8bf092c9ee201a554b91d760d5a30a57f38102eae340e080ef8c6a39327f6881eda391b20b108d clang-3.2.src.tar.gz -b0982466670b63abde7787e4f1166c357ed2736ff23ce23511788441853bc14e5e9d25763d729dc33706200c39406138356d2cacee72057dc2b2852ea2b78174 llvm-3.2-alpine-linux.patch" +3878cfff1ab702c275d47b831751d87b2a112223ea6fe1fcc30e5f8e06b2fedf4f07b8ca9c65b3e6ac35dc6feba8d91a8b0579f9b2fe194ccdb202c2b9338640 llvm-3.2-alpine-linux.patch" diff --git a/main/llvm/llvm-3.2-alpine-linux.patch b/main/llvm/llvm-3.2-alpine-linux.patch index 4064a0d4a7..ecde9e2837 100644 --- a/main/llvm/llvm-3.2-alpine-linux.patch +++ b/main/llvm/llvm-3.2-alpine-linux.patch @@ -95,7 +95,7 @@ diff -urp llvm-3.2.src.orig/tools/clang/lib/Driver/Tools.cpp llvm-3.2.src.new/to else if (ToolChain.getArch() == llvm::Triple::ppc64) CmdArgs.push_back("/lib64/ld64.so.1"); + else if (ToolChain.getTriple().getEnvironment() == llvm::Triple::UClibc) -+ CmdArgs.push_back("/lib64/ld64-uClibc.so.0.9.32"); ++ CmdArgs.push_back("/lib/ld64-uClibc.so.0.9.32"); else CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); } |