From: "Fabian Groffen (grobian)" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.3-r1.ebuild ChangeLog
Date: Wed, 14 Aug 2013 19:50:29 +0000 (UTC) [thread overview]
Message-ID: <20130814195029.1AB012171C@flycatcher.gentoo.org> (raw)
grobian 13/08/14 19:50:29
Modified: llvm-9999.ebuild llvm-3.3-r1.ebuild ChangeLog
Log:
Don't depend on/try to use chrpath on Darwin, bug #479568
(Portage version: 2.2.01.22288-prefix/cvs/Darwin i386, RepoMan options: --force, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path
1.50 sys-devel/llvm/llvm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.49&r2=1.50
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- llvm-9999.ebuild 14 Aug 2013 12:59:43 -0000 1.49
+++ llvm-9999.ebuild 14 Aug 2013 19:50:28 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.49 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.50 2013/08/14 19:50:28 grobian Exp $
EAPI=5
@@ -18,9 +18,9 @@
SLOT="0/${PV}"
KEYWORDS=""
IUSE="clang debug doc gold +libffi multitarget ocaml python
- +static-analyzer test udis86 video_cards_radeon"
+ +static-analyzer test udis86 video_cards_radeon kernel_Darwin"
-DEPEND="app-admin/chrpath
+DEPEND="!kernel_Darwin? ( app-admin/chrpath )
dev-lang/perl
dev-python/sphinx
>=sys-devel/make-3.79
@@ -273,8 +273,10 @@
emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
# Fix rpaths.
- chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
- "${ED}"/usr/bin/* || die
+ if use !kernel_Darwin ; then
+ chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+ "${ED}"/usr/bin/* || die
+ fi
if multilib_is_native_abi; then
# Move files back.
1.11 sys-devel/llvm/llvm-3.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild?r1=1.10&r2=1.11
Index: llvm-3.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- llvm-3.3-r1.ebuild 14 Aug 2013 12:59:43 -0000 1.10
+++ llvm-3.3-r1.ebuild 14 Aug 2013 19:50:28 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.10 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r1.ebuild,v 1.11 2013/08/14 19:50:28 grobian Exp $
EAPI=5
@@ -19,10 +19,10 @@
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="clang debug doc gold kernel_FreeBSD +libffi multitarget ocaml python
- +static-analyzer test udis86 video_cards_radeon"
+IUSE="clang debug doc gold kernel_Darwin kernel_FreeBSD +libffi multitarget
+ ocaml python +static-analyzer test udis86 video_cards_radeon"
-DEPEND="app-admin/chrpath
+DEPEND="!kernel_Darwin? ( app-admin/chrpath )
dev-lang/perl
>=sys-devel/make-3.79
>=sys-devel/flex-2.5.4
@@ -296,8 +296,10 @@
emake DESTDIR="${D}" GENTOO_LIBDIR=$(get_libdir) install
# Fix rpaths.
- chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
- "${ED}"/usr/bin/* || die
+ if use !kernel_Darwin ; then
+ chrpath -r "${EPREFIX}"/usr/$(get_libdir)/llvm \
+ "${ED}"/usr/bin/* || die
+ fi
if multilib_is_native_abi; then
# Move files back.
1.132 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.131&r2=1.132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog 14 Aug 2013 12:59:43 -0000 1.131
+++ ChangeLog 14 Aug 2013 19:50:28 -0000 1.132
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.131 2013/08/14 12:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.132 2013/08/14 19:50:28 grobian Exp $
+
+ 14 Aug 2013; Fabian Groffen <grobian@gentoo.org> llvm-3.3-r1.ebuild,
+ llvm-9999.ebuild:
+ Don't depend on/try to use chrpath on Darwin, bug #479568
14 Aug 2013; Michał Górny <mgorny@gentoo.org> llvm-3.2.ebuild,
llvm-3.3-r1.ebuild, llvm-3.3.ebuild, llvm-9999.ebuild:
next reply other threads:[~2013-08-14 19:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 19:50 Fabian Groffen (grobian) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-04 15:43 [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.3-r1.ebuild ChangeLog Michal Gorny (mgorny)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130814195029.1AB012171C@flycatcher.gentoo.org \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox