grobian 14/11/10 20:37:58
Modified: ChangeLog llvm-3.4.2.ebuild llvm-9999.ebuild
llvm-3.5.0.ebuild
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.210 sys-devel/llvm/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.210&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.210&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.209&r2=1.210
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- ChangeLog 20 Oct 2014 07:08:16 -0000 1.209
+++ ChangeLog 10 Nov 2014 20:37:57 -0000 1.210
@@ -1,6 +1,11 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.209 2014/10/20
07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.210 2014/11/10
20:37:57 grobian Exp $
+
+ 10 Nov 2014; Fabian Groffen <[email protected]> llvm-3.4.2.ebuild,
+ llvm-3.5.0.ebuild, llvm-9999.ebuild, +files/clang-3.4-darwin_build_fix.patch,
+ +files/clang-3.4-darwin_prefix-include-paths.patch:
+ Make clang 3.4.2 find Prefix headers on Darwin
20 Oct 2014; Michał Górny <[email protected]> llvm-3.5.0.ebuild,
llvm-9999.ebuild:
1.4 sys-devel/llvm/llvm-3.4.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild?r1=1.3&r2=1.4
Index: llvm-3.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- llvm-3.4.2.ebuild 17 Sep 2014 23:29:09 -0000 1.3
+++ llvm-3.4.2.ebuild 10 Nov 2014 20:37:57 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.3
2014/09/17 23:29:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.4
2014/11/10 20:37:57 grobian Exp $
EAPI=5
@@ -10,7 +10,7 @@
WANT_CMAKE=cmake
inherit cmake-utils eutils flag-o-matic multibuild multilib \
- multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
+ multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
DESCRIPTION="Low Level Virtual Machine"
HOMEPAGE="http://llvm.org/";
@@ -22,7 +22,7 @@
LICENSE="UoI-NCSA"
SLOT="0/3.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
+static-analyzer test udis86 xml video_cards_radeon
kernel_Darwin kernel_FreeBSD"
@@ -179,11 +179,14 @@
epatch
"${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
+ epatch "${FILESDIR}"/clang-3.4-darwin_build_fix.patch
+ epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+ eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
fi
if use prefix && use clang; then
- sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
- -i
'projects/compiler-rt/make/platform/clang_linux.mk' || die
+ sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+ projects/compiler-rt/make/platform/clang_*.mk || die
fi
local sub_files=(
@@ -442,11 +445,11 @@
# Fix install_names on Darwin. The build system is too complicated
# to just fix this, so we correct it post-install
- local lib= f= odylib= libpv=${PV}
+ local lib= f= odylib= ndylib= libpv=${PV}
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- for lib in
lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib
LLVMHello.dylib ; do
+ for lib in
lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib
LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -457,21 +460,32 @@
"${ED}"/usr/lib/${lib}
eend $?
done
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib
; do
+ for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
- odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' |
grep libLLVM-${libpv}.dylib)
- ebegin "fixing install_name reference to ${odylib} of
${f##*/}"
- install_name_tool \
- -change "${odylib}" \
-
"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
- -change "@rpath/libclang.dylib" \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- -change "${S}"/Release/lib/libclang.dylib \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- "${f}"
- eend $?
+ scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+ while read odylib ; do
+ ndylib=
+ case ${odylib} in
+ */libclang.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+ ;;
+ */libLLVM-${libpv}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+ ;;
+ */libLTO.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+ ;;
+ esac
+ if [[ -n ${ndylib} ]] ; then
+ ebegin "fixing install_name reference
to ${odylib} of ${f##*/}"
+ install_name_tool \
+ -change "${odylib}" "${ndylib}"
\
+ "${f}"
+ eend $?
+ fi
+ done
done
fi
}
1.93 sys-devel/llvm/llvm-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.93&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.93&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.92&r2=1.93
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- llvm-9999.ebuild 20 Oct 2014 07:08:16 -0000 1.92
+++ llvm-9999.ebuild 10 Nov 2014 20:37:57 -0000 1.93
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.92
2014/10/20 07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.93
2014/11/10 20:37:57 grobian Exp $
EAPI=5
@@ -155,8 +155,8 @@
fi
if use prefix && use clang; then
- sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
- -i
'projects/compiler-rt/make/platform/clang_linux.mk' || die
+ sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+ projects/compiler-rt/make/platform/clang_*.mk || die
fi
local sub_files=(
1.5 sys-devel/llvm/llvm-3.5.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?r1=1.4&r2=1.5
Index: llvm-3.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- llvm-3.5.0.ebuild 20 Oct 2014 07:08:16 -0000 1.4
+++ llvm-3.5.0.ebuild 10 Nov 2014 20:37:57 -0000 1.5
@@ -1,13 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.4
2014/10/20 07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.5
2014/11/10 20:37:57 grobian Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy )
inherit eutils flag-o-matic multibuild multilib \
- multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
+ multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
DESCRIPTION="Low Level Virtual Machine"
HOMEPAGE="http://llvm.org/";
@@ -19,7 +19,7 @@
LICENSE="UoI-NCSA"
SLOT="0/3.5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
+static-analyzer test xml video_cards_radeon
kernel_Darwin kernel_FreeBSD"
@@ -75,6 +75,7 @@
CMAKE_MAKEFILE_GENERATOR=emake
pkg_pretend() {
+ $(tc-is-static-only && echo --disable-shared) \
# in megs
# !clang !debug !multitarget -O2 400
# !clang !debug multitarget -O2 550
@@ -154,11 +155,13 @@
epatch
"${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+ epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+ eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
fi
if use prefix && use clang; then
- sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
- -i
'projects/compiler-rt/make/platform/clang_linux.mk' || die
+ sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+ projects/compiler-rt/make/platform/clang_*.mk || die
fi
local sub_files=(
@@ -429,11 +432,11 @@
# Fix install_names on Darwin. The build system is too complicated
# to just fix this, so we correct it post-install
- local lib= f= odylib= libpv=${PV}
+ local lib= f= odylib= ndylib= libpv=${PV}
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- for lib in
lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib
LLVMHello.dylib ; do
+ for lib in
lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib
LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -444,21 +447,32 @@
"${ED}"/usr/lib/${lib}
eend $?
done
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib
; do
+ for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib
"${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
# omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
- odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' |
grep libLLVM-${libpv}.dylib)
- ebegin "fixing install_name reference to ${odylib} of
${f##*/}"
- install_name_tool \
- -change "${odylib}" \
-
"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
- -change "@rpath/libclang.dylib" \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- -change "${S}"/Release/lib/libclang.dylib \
- "${EPREFIX}"/usr/lib/libclang.dylib \
- "${f}"
- eend $?
+ scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+ while read odylib ; do
+ ndylib=
+ case ${odylib} in
+ */libclang.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+ ;;
+ */libLLVM-${libpv}.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+ ;;
+ */libLTO.dylib)
+
ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+ ;;
+ esac
+ if [[ -n ${ndylib} ]] ; then
+ ebegin "fixing install_name reference
to ${odylib} of ${f##*/}"
+ install_name_tool \
+ -change "${odylib}" "${ndylib}"
\
+ "${f}"
+ eend $?
+ fi
+ done
done
fi
}
