[patch] patch to the ebuilds of 3.4.2 and 3.5.[01] that fixes all three problems on darwin (for me)

llvm-darwin-fixes.patch (text/plain), 8.21 KB, created by Michael Weiser on 2015-01-22 12:26:55 UTC

diff -urN sys-devel/llvm/files/llvm-3.4.2-leopard-no-asan.patch sys-devel/llvm/files/llvm-3.4.2-leopard-no-asan.patch
--- sys-devel/llvm/files/llvm-3.4.2-leopard-no-asan.patch	1970-01-01 01:00:00.000000000 +0100
+++ sys-devel/llvm/files/llvm-3.4.2-leopard-no-asan.patch	2015-01-21 20:34:11.000000000 +0100
@@ -0,0 +1,37 @@
+--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig	2013-11-22 06:31:50.000000000 -0800
++++ a/projects/compiler-rt/make/platform/clang_darwin.mk	2014-04-17 22:17:52.000000000 -0700
+@@ -85,8 +85,8 @@ Configs += profile_ios
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
+ 
+ # Configurations which define the ASAN support functions.
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
++#Configs += asan_osx_dynamic
++#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
+ 
+ IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+ ifneq ($(IOSSIM_SDK_PATH),)
+@@ -94,8 +94,8 @@ Configs += asan_iossim_dynamic
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic)
+ endif
+ 
+-Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
++#Configs += ubsan_osx
++#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
+ 
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
+ # object files. If we are on that platform, strip out all ARM archs. We still
+--- a/tools/clang/runtime/compiler-rt/Makefile.orig	2013-11-15 15:12:44.000000000 -0800
++++ a/tools/clang/runtime/compiler-rt/Makefile	2014-04-17 22:18:44.000000000 -0700
+@@ -81,9 +81,7 @@ ifeq ($(OS),Darwin)
+ RuntimeDirs += darwin darwin_embedded
+ RuntimeLibrary.darwin.Configs := \
+ 	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
+-	asan_osx_dynamic.dylib \
+-	profile_osx.a profile_ios.a \
+-	ubsan_osx.a
++	profile_osx.a profile_ios.a
+ RuntimeLibrary.darwin_embedded.Configs := \
+ 	soft_static.a hard_static.a soft_pic.a hard_pic.a
+ 
diff -urN sys-devel/llvm/files/llvm-3.5.0-leopard-no-asan.patch sys-devel/llvm/files/llvm-3.5.0-leopard-no-asan.patch
--- sys-devel/llvm/files/llvm-3.5.0-leopard-no-asan.patch	1970-01-01 01:00:00.000000000 +0100
+++ sys-devel/llvm/files/llvm-3.5.0-leopard-no-asan.patch	2015-01-21 20:34:11.000000000 +0100
@@ -0,0 +1,37 @@
+--- llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk.no_asan	2015-01-19 00:55:11.000000000 -0900
++++ llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk	2015-01-19 00:55:50.000000000 -0900
+@@ -94,8 +94,8 @@
+ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 x86_64h armv7,profile_ios)
+ 
+ # Configurations which define the ASAN support functions.
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
++#Configs += asan_osx_dynamic
++#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic)
+ 
+ IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+ ifneq ($(IOSSIM_SDK_PATH),)
+@@ -103,8 +103,8 @@
+ UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_iossim_dynamic)
+ endif
+ 
+-Configs += ubsan_osx
+-UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
++#Configs += ubsan_osx
++#UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx)
+ 
+ # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
+ # object files. If we are on that platform, strip out all ARM archs. We still
+--- llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile.no_asan	2015-01-19 00:55:11.000000000 -0900
++++ llvm-3.5.0.src/tools/clang/runtime/compiler-rt/Makefile	2015-01-19 00:56:10.000000000 -0900
+@@ -81,9 +81,7 @@
+ RuntimeDirs += darwin macho_embedded
+ RuntimeLibrary.darwin.Configs := \
+ 	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
+-	asan_osx_dynamic.dylib \
+-	profile_osx.a profile_ios.a \
+-	ubsan_osx.a
++	profile_osx.a profile_ios.a
+ 
+ RuntimeLibrary.macho_embedded.Configs := \
+ 	hard_static.a hard_pic.a
diff -urN sys-devel/llvm/llvm-3.4.2.ebuild sys-devel/llvm/llvm-3.4.2.ebuild
--- sys-devel/llvm/llvm-3.4.2.ebuild	2015-01-11 21:31:39.000000000 +0100
+++ sys-devel/llvm/llvm-3.4.2.ebuild	2015-01-21 20:34:11.000000000 +0100
@@ -186,8 +186,16 @@
 	fi
 
 	if use prefix && use clang; then
+		# append our search paths and keep the makefiles from
+		# overriding CC with one found via xcrun
 		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-			projects/compiler-rt/make/platform/clang_*.mk || die
+			-e "s@override CC@CC@" \
+			projects/compiler-rt/make/platform/{clang,darwin}_*.mk || die
+	fi
+
+	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
+		# https://trac.macports.org/ticket/43353
+		epatch "${FILESDIR}"/${PN}-3.4.2-leopard-no-asan.patch
 	fi
 
 	local sub_files=(
@@ -345,6 +353,20 @@
 			BUILD_CLANG_ONLY=YES
 		)
 	fi
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Keep compiler-rt from using the system's compiler and SDKs.
+		# This also disables the iphonesimulator target.
+		MAKEARGS+=(
+			DSYMUTIL=dsymutil
+			LIPO=lipo
+			STRIP=strip
+			RANLIB=ranlib
+			AR=ar
+			IOSSIM_SDK_PATH=
+			ACTIVE_SDK_PATH=
+		)
+	fi
 }
 
 multilib_src_compile() {
diff -urN sys-devel/llvm/llvm-3.5.0.ebuild sys-devel/llvm/llvm-3.5.0.ebuild
--- sys-devel/llvm/llvm-3.5.0.ebuild	2015-01-01 22:01:42.000000000 +0100
+++ sys-devel/llvm/llvm-3.5.0.ebuild	2015-01-22 11:15:07.000000000 +0100
@@ -49,7 +49,7 @@
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	libffi? ( virtual/pkgconfig )
@@ -159,10 +159,18 @@
 	fi
 
 	if use prefix && use clang; then
+		# append our search paths and keep the makefiles from
+		# overriding CC with one found via xcrun
 		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+			-e "s@override CC@CC@" \
 			projects/compiler-rt/make/platform/clang_*.mk || die
 	fi
 
+	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
+		# https://trac.macports.org/ticket/43353
+		epatch "${FILESDIR}"/${PN}-3.5.0-leopard-no-asan.patch
+	fi
+
 	local sub_files=(
 		Makefile.config.in
 		Makefile.rules
@@ -294,6 +302,20 @@
 			BUILD_CLANG_ONLY=YES
 		)
 	fi
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Keep compiler-rt from using the system's compiler and SDKs.
+		# This also disables the iphonesimulator target.
+		MAKEARGS+=(
+			DSYMUTIL=dsymutil
+			LIPO=lipo
+			STRIP=strip
+			RANLIB=ranlib
+			AR=ar
+			IOSSIM_SDK_PATH=
+			ACTIVE_SDK_PATH=
+		)
+	fi
 }
 
 multilib_src_compile() {
diff -urN sys-devel/llvm/llvm-3.5.1.ebuild sys-devel/llvm/llvm-3.5.1.ebuild
--- sys-devel/llvm/llvm-3.5.1.ebuild	2015-01-21 16:01:30.000000000 +0100
+++ sys-devel/llvm/llvm-3.5.1.ebuild	2015-01-22 11:19:33.000000000 +0100
@@ -49,7 +49,7 @@
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
 		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
 	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	libffi? ( virtual/pkgconfig )
@@ -157,10 +157,18 @@
 	fi
 
 	if use prefix && use clang; then
+		# append our search paths and keep the makefiles from
+		# overriding CC with one found via xcrun
 		sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+			-e "s@override CC@CC@" \
 			projects/compiler-rt/make/platform/clang_*.mk || die
 	fi
 
+	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
+		# https://trac.macports.org/ticket/43353
+		epatch "${FILESDIR}"/${PN}-3.5.0-leopard-no-asan.patch
+	fi
+
 	local sub_files=(
 		Makefile.config.in
 		Makefile.rules
@@ -292,6 +300,20 @@
 			BUILD_CLANG_ONLY=YES
 		)
 	fi
+
+	if [[ ${CHOST} == *darwin* ]] ; then
+		# Keep compiler-rt from using the system's compiler and SDKs.
+		# This also disables the iphonesimulator target.
+		MAKEARGS+=(
+			DSYMUTIL=dsymutil
+			LIPO=lipo
+			STRIP=strip
+			RANLIB=ranlib
+			AR=ar
+			IOSSIM_SDK_PATH=
+			ACTIVE_SDK_PATH=
+		)
+	fi
 }
 
 multilib_src_compile() {