Attachment #394604 for bug #537342

Line 0 Link Here

(-)sys-devel/llvm/llvm-3.4.2.ebuild (-1 / +25 lines)
		1	--- a/projects/compiler-rt/make/platform/clang_darwin.mk.orig 2013-11-22 06:31:50.000000000 -0800
Line 0 Link Here
		1	--- llvm-3.5.0.src/projects/compiler-rt/make/platform/clang_darwin.mk.no_asan 2015-01-19 00:55:11.000000000 -0900
Lines 186-193 Link Here
186	fi	186	fi
187		187
188	if use prefix && use clang; then	188	if use prefix && use clang; then
		189	# append our search paths and keep the makefiles from
		190	# overriding CC with one found via xcrun
189	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \	191	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
190	projects/compiler-rt/make/platform/clang_*.mk \|\| die	192	-e "s@override CC@CC@" \
		193	projects/compiler-rt/make/platform/{clang,darwin}_*.mk \|\| die
		194	fi
		195
		196	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
		197	# https://trac.macports.org/ticket/43353
		198	epatch "${FILESDIR}"/${PN}-3.4.2-leopard-no-asan.patch
191	fi	199	fi
192		200
193	local sub_files=(	201	local sub_files=(
Lines 345-350 Link Here
345	BUILD_CLANG_ONLY=YES	353	BUILD_CLANG_ONLY=YES
346	)	354	)
347	fi	355	fi
		356
		357	if [[ ${CHOST} == darwin ]] ; then
		358	# Keep compiler-rt from using the system's compiler and SDKs.
		359	# This also disables the iphonesimulator target.
		360	MAKEARGS+=(
		361	DSYMUTIL=dsymutil
		362	LIPO=lipo
		363	STRIP=strip
		364	RANLIB=ranlib
		365	AR=ar
		366	IOSSIM_SDK_PATH=
		367	ACTIVE_SDK_PATH=
		368	)
		369	fi
348	}	370	}
349		371
350	multilib_src_compile() {	372	multilib_src_compile() {

Lines 49-55 Link Here

(-)sys-devel/llvm/llvm-3.5.0.ebuild (-1 / +23 lines)
49	\|\| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1	49	\|\| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
50	( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )	50	( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
51	)	51	)
52	\|\| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )	52	\|\| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
53	clang? ( xml? ( virtual/pkgconfig ) )	53	clang? ( xml? ( virtual/pkgconfig ) )
54	doc? ( dev-python/sphinx )	54	doc? ( dev-python/sphinx )
55	libffi? ( virtual/pkgconfig )	55	libffi? ( virtual/pkgconfig )
Lines 159-168 Link Here
159	fi	159	fi
160		160
161	if use prefix && use clang; then	161	if use prefix && use clang; then
		162	# append our search paths and keep the makefiles from
		163	# overriding CC with one found via xcrun
162	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \	164	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
		165	-e "s@override CC@CC@" \
163	projects/compiler-rt/make/platform/clang_*.mk \|\| die	166	projects/compiler-rt/make/platform/clang_*.mk \|\| die
164	fi	167	fi
165		168
		169	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
		170	# https://trac.macports.org/ticket/43353
		171	epatch "${FILESDIR}"/${PN}-3.5.0-leopard-no-asan.patch
		172	fi
		173
166	local sub_files=(	174	local sub_files=(
167	Makefile.config.in	175	Makefile.config.in
168	Makefile.rules	176	Makefile.rules
Lines 294-299 Link Here
294	BUILD_CLANG_ONLY=YES	302	BUILD_CLANG_ONLY=YES
295	)	303	)
296	fi	304	fi
		305
		306	if [[ ${CHOST} == darwin ]] ; then
		307	# Keep compiler-rt from using the system's compiler and SDKs.
		308	# This also disables the iphonesimulator target.
		309	MAKEARGS+=(
		310	DSYMUTIL=dsymutil
		311	LIPO=lipo
		312	STRIP=strip
		313	RANLIB=ranlib
		314	AR=ar
		315	IOSSIM_SDK_PATH=
		316	ACTIVE_SDK_PATH=
		317	)
		318	fi
297	}	319	}
298		320
299	multilib_src_compile() {	321	multilib_src_compile() {

Lines 49-55 Link Here

(-)sys-devel/llvm/llvm-3.5.1.ebuild (-1 / +23 lines)
49	\|\| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1	49	\|\| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
50	( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )	50	( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
51	)	51	)
52	\|\| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )	52	\|\| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
53	clang? ( xml? ( virtual/pkgconfig ) )	53	clang? ( xml? ( virtual/pkgconfig ) )
54	doc? ( dev-python/sphinx )	54	doc? ( dev-python/sphinx )
55	libffi? ( virtual/pkgconfig )	55	libffi? ( virtual/pkgconfig )
Lines 157-166 Link Here
157	fi	157	fi
158		158
159	if use prefix && use clang; then	159	if use prefix && use clang; then
		160	# append our search paths and keep the makefiles from
		161	# overriding CC with one found via xcrun
160	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \	162	sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
		163	-e "s@override CC@CC@" \
161	projects/compiler-rt/make/platform/clang_*.mk \|\| die	164	projects/compiler-rt/make/platform/clang_*.mk \|\| die
162	fi	165	fi
163		166
		167	if [[ "${CHOST##*-darwin}" -le 9 ]] ; then
		168	# https://trac.macports.org/ticket/43353
		169	epatch "${FILESDIR}"/${PN}-3.5.0-leopard-no-asan.patch
		170	fi
		171
164	local sub_files=(	172	local sub_files=(
165	Makefile.config.in	173	Makefile.config.in
166	Makefile.rules	174	Makefile.rules
Lines 292-297 Link Here
292	BUILD_CLANG_ONLY=YES	300	BUILD_CLANG_ONLY=YES
293	)	301	)
294	fi	302	fi
		303
		304	if [[ ${CHOST} == darwin ]] ; then
		305	# Keep compiler-rt from using the system's compiler and SDKs.
		306	# This also disables the iphonesimulator target.
		307	MAKEARGS+=(
		308	DSYMUTIL=dsymutil
		309	LIPO=lipo
		310	STRIP=strip
		311	RANLIB=ranlib
		312	AR=ar
		313	IOSSIM_SDK_PATH=
		314	ACTIVE_SDK_PATH=
		315	)
		316	fi
295	}	317	}
296		318
297	multilib_src_compile() {	319	multilib_src_compile() {

Return to bug 537342