grobian 14/11/10 20:37:57
Added: clang-3.4-darwin_build_fix.patch
clang-3.4-darwin_prefix-include-paths.patch
Log:
Make clang 3.4.2 find Prefix headers on Darwin, force for virtual deps in
untouched ebuilds
(Portage version: 2.2.14_rc1-prefix/cvs/Darwin i386, RepoMan options:
--force, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path
1.1 sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch?rev=1.1&content-type=text/plain
Index: clang-3.4-darwin_build_fix.patch
===================================================================
Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get
"unable to interface with target machine" errors while building if we
attempt to. Disable those targets.
Patch by Reza Jelveh from
https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch
--- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
@@ -27,20 +27,20 @@ UniversalArchs :=
# Soft-float version of the runtime. No floating-point instructions will be
used
# and the ABI (out of necessity) passes floating values in normal registers:
# non-VFP variant of the AAPCS.
-Configs += soft_static
-UniversalArchs.soft_static := armv6m armv7m armv7em armv7
+# Configs += soft_static
+# UniversalArchs.soft_static := armv6m armv7m armv7em armv7
# Hard-float version of the runtime. On ARM VFP instructions and registers are
# allowed, and floating point values get passed in them. VFP variant of the
# AAPCS.
Configs += hard_static
-UniversalArchs.hard_static := armv7em armv7 i386 x86_64
+UniversalArchs.hard_static := i386 x86_64
-Configs += soft_pic
-UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
+# Configs += soft_pic
+# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
Configs += hard_pic
-UniversalArchs.hard_pic := armv7em armv7 i386 x86_64
+UniversalArchs.hard_pic := i386 x86_64
CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding
--- a/tools/clang/runtime/compiler-rt/Makefile
+++ b/tools/clang/runtime/compiler-rt/Makefile
@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \
profile_osx.a profile_ios.a \
ubsan_osx.a
RuntimeLibrary.darwin_embedded.Configs := \
- soft_static.a hard_static.a soft_pic.a hard_pic.a
+ hard_static.a hard_pic.a
# Support building compiler-rt with relocatable SDKs.
#
1.1
sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch?rev=1.1&content-type=text/plain
Index: clang-3.4-darwin_prefix-include-paths.patch
===================================================================
--- tools/clang/lib/Frontend/InitHeaderSearch.cpp
+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
@@ -233,6 +233,7 @@
case llvm::Triple::Bitrig:
break;
default:
+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
// FIXME: temporary hack: hard-coded paths.
AddPath("/usr/local/include", System, false);
break;
@@ -505,6 +506,7 @@
// Add the default framework include paths on Darwin.
if (HSOpts.UseStandardSystemIncludes) {
if (triple.isOSDarwin()) {
+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true);
AddPath("/System/Library/Frameworks", System, true);
AddPath("/Library/Frameworks", System, true);
}
