| 1 |
grobian 10/08/26 07:00:53 |
| 2 |
|
| 3 |
Modified: ChangeLog llvm-9999.ebuild llvm-2.7.ebuild |
| 4 |
Log: |
| 5 |
Bump to EAPI=3, make Prefix aware, add support for Darwin platforms, bug #333387 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.15553-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.16 sys-devel/llvm/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.16&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.16&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.15&r2=1.16 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 19 |
retrieving revision 1.15 |
| 20 |
retrieving revision 1.16 |
| 21 |
diff -u -r1.15 -r1.16 |
| 22 |
--- ChangeLog 20 Jul 2010 09:25:26 -0000 1.15 |
| 23 |
+++ ChangeLog 26 Aug 2010 07:00:53 -0000 1.16 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for sys-devel/llvm |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.15 2010/07/20 09:25:26 voyageur Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.16 2010/08/26 07:00:53 grobian Exp $ |
| 29 |
+ |
| 30 |
+ 26 Aug 2010; Fabian Groffen <grobian@g.o> llvm-2.7.ebuild, |
| 31 |
+ llvm-9999.ebuild: |
| 32 |
+ Bump to EAPI=3, make Prefix aware, add support for Darwin platforms, |
| 33 |
+ bug #333387 |
| 34 |
|
| 35 |
20 Jul 2010; Bernard Cafarelli <voyageur@g.o> -llvm-2.6-r2.ebuild, |
| 36 |
-files/llvm-2.6-cflags.patch: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 sys-devel/llvm/llvm-9999.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: llvm-9999.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- llvm-9999.ebuild 1 Jun 2010 21:25:28 -0000 1.1 |
| 53 |
+++ llvm-9999.ebuild 26 Aug 2010 07:00:53 -0000 1.2 |
| 54 |
@@ -1,8 +1,8 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.1 2010/06/01 21:25:28 voyageur Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.2 2010/08/26 07:00:53 grobian Exp $ |
| 59 |
|
| 60 |
-EAPI="2" |
| 61 |
+EAPI="3" |
| 62 |
inherit subversion eutils multilib toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="Low Level Virtual Machine" |
| 65 |
@@ -21,8 +21,8 @@ |
| 66 |
>=sys-devel/bison-1.28 |
| 67 |
!~sys-devel/bison-1.85 |
| 68 |
!~sys-devel/bison-1.875 |
| 69 |
- >=sys-devel/gcc-3.0 |
| 70 |
- >=sys-devel/binutils-2.18 |
| 71 |
+ || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.1.2 ) |
| 72 |
+ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) |
| 73 |
libffi? ( virtual/libffi ) |
| 74 |
ocaml? ( dev-lang/ocaml ) |
| 75 |
test? ( dev-util/dejagnu ) |
| 76 |
@@ -70,7 +70,7 @@ |
| 77 |
# care of this. |
| 78 |
einfo "Fixing install dirs" |
| 79 |
sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ |
| 80 |
- -e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \ |
| 81 |
+ -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ |
| 82 |
-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \ |
| 83 |
-i Makefile.config.in || die "Makefile.config sed failed" |
| 84 |
|
| 85 |
@@ -111,7 +111,7 @@ |
| 86 |
local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope |
| 87 |
if use llvm-gcc ; then |
| 88 |
if has_version sys-devel/llvm-gcc; then |
| 89 |
- LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null) |
| 90 |
+ LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null) |
| 91 |
LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null) |
| 92 |
if [[ -z ${LLVM_GCC_DRIVER} ]] ; then |
| 93 |
die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}" |
| 94 |
@@ -150,4 +150,13 @@ |
| 95 |
|
| 96 |
src_install() { |
| 97 |
emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed" |
| 98 |
+ |
| 99 |
+ # Fix install_names on Darwin. The build system is too complicated |
| 100 |
+ # to just fix this, so we correct it post-install |
| 101 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 102 |
+ for lib in lib{LLVMHello,LTO,profile_rt}.dylib ; do |
| 103 |
+ install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \ |
| 104 |
+ "${ED}"/usr/lib/${lib} |
| 105 |
+ done |
| 106 |
+ fi |
| 107 |
} |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.3 sys-devel/llvm/llvm-2.7.ebuild |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild?rev=1.3&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild?rev=1.3&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild?r1=1.2&r2=1.3 |
| 116 |
|
| 117 |
Index: llvm-2.7.ebuild |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v |
| 120 |
retrieving revision 1.2 |
| 121 |
retrieving revision 1.3 |
| 122 |
diff -u -r1.2 -r1.3 |
| 123 |
--- llvm-2.7.ebuild 1 Jun 2010 19:29:46 -0000 1.2 |
| 124 |
+++ llvm-2.7.ebuild 26 Aug 2010 07:00:53 -0000 1.3 |
| 125 |
@@ -1,8 +1,8 @@ |
| 126 |
# Copyright 1999-2010 Gentoo Foundation |
| 127 |
# Distributed under the terms of the GNU General Public License v2 |
| 128 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v 1.2 2010/06/01 19:29:46 voyageur Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v 1.3 2010/08/26 07:00:53 grobian Exp $ |
| 130 |
|
| 131 |
-EAPI="2" |
| 132 |
+EAPI="3" |
| 133 |
inherit eutils multilib toolchain-funcs |
| 134 |
|
| 135 |
DESCRIPTION="Low Level Virtual Machine" |
| 136 |
@@ -11,7 +11,7 @@ |
| 137 |
|
| 138 |
LICENSE="UoI-NCSA" |
| 139 |
SLOT="0" |
| 140 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 141 |
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos" |
| 142 |
IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86" |
| 143 |
|
| 144 |
DEPEND="dev-lang/perl |
| 145 |
@@ -20,8 +20,8 @@ |
| 146 |
>=sys-devel/bison-1.28 |
| 147 |
!~sys-devel/bison-1.85 |
| 148 |
!~sys-devel/bison-1.875 |
| 149 |
- >=sys-devel/gcc-3.0 |
| 150 |
- >=sys-devel/binutils-2.18 |
| 151 |
+ || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.1.2 ) |
| 152 |
+ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) |
| 153 |
libffi? ( virtual/libffi ) |
| 154 |
ocaml? ( dev-lang/ocaml ) |
| 155 |
test? ( dev-util/dejagnu ) |
| 156 |
@@ -69,7 +69,7 @@ |
| 157 |
# care of this. |
| 158 |
einfo "Fixing install dirs" |
| 159 |
sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ |
| 160 |
- -e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \ |
| 161 |
+ -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ |
| 162 |
-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \ |
| 163 |
-i Makefile.config.in || die "Makefile.config sed failed" |
| 164 |
|
| 165 |
@@ -110,7 +110,7 @@ |
| 166 |
local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope |
| 167 |
if use llvm-gcc ; then |
| 168 |
if has_version sys-devel/llvm-gcc; then |
| 169 |
- LLVM_GCC_DIR=$(ls -d ${ROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null) |
| 170 |
+ LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null) |
| 171 |
LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null) |
| 172 |
if [[ -z ${LLVM_GCC_DRIVER} ]] ; then |
| 173 |
die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}" |
| 174 |
@@ -149,4 +149,13 @@ |
| 175 |
|
| 176 |
src_install() { |
| 177 |
emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed" |
| 178 |
+ |
| 179 |
+ # Fix install_names on Darwin. The build system is too complicated |
| 180 |
+ # to just fix this, so we correct it post-install |
| 181 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 182 |
+ for lib in lib{LLVMHello,LTO,profile_rt}.dylib ; do |
| 183 |
+ install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \ |
| 184 |
+ "${ED}"/usr/lib/${lib} |
| 185 |
+ done |
| 186 |
+ fi |
| 187 |
} |
Archives