| 1 |
mgorny 13/12/29 22:49:49 |
| 2 |
|
| 3 |
Modified: llvm-9999.ebuild llvm-3.3-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Explicitly require Makefiles from CMake, to avoid failures when people like to enable ninja globally. Bug #496426. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.74 sys-devel/llvm/llvm-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.74&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.74&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.73&r2=1.74 |
| 15 |
|
| 16 |
Index: llvm-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v |
| 19 |
retrieving revision 1.73 |
| 20 |
retrieving revision 1.74 |
| 21 |
diff -u -r1.73 -r1.74 |
| 22 |
--- llvm-9999.ebuild 28 Dec 2013 14:02:19 -0000 1.73 |
| 23 |
+++ llvm-9999.ebuild 29 Dec 2013 22:49:49 -0000 1.74 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.73 2013/12/28 14:02:19 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.74 2013/12/29 22:49:49 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -59,6 +59,11 @@ |
| 33 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 34 |
test? ( || ( $(python_gen_useflags 'python*') ) )" |
| 35 |
|
| 36 |
+# Some people actually override that in make.conf. That sucks since |
| 37 |
+# we need to run install per-directory, and ninja can't do that... |
| 38 |
+# so why did it call itself ninja in the first place? |
| 39 |
+CMAKE_MAKEFILE_GENERATOR=emake |
| 40 |
+ |
| 41 |
pkg_pretend() { |
| 42 |
# in megs |
| 43 |
# !clang !debug !multitarget -O2 400 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.4 sys-devel/llvm/llvm-3.3-r2.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild?rev=1.4&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild?rev=1.4&content-type=text/plain |
| 51 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild?r1=1.3&r2=1.4 |
| 52 |
|
| 53 |
Index: llvm-3.3-r2.ebuild |
| 54 |
=================================================================== |
| 55 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild,v |
| 56 |
retrieving revision 1.3 |
| 57 |
retrieving revision 1.4 |
| 58 |
diff -u -r1.3 -r1.4 |
| 59 |
--- llvm-3.3-r2.ebuild 28 Dec 2013 22:56:42 -0000 1.3 |
| 60 |
+++ llvm-3.3-r2.ebuild 29 Dec 2013 22:49:49 -0000 1.4 |
| 61 |
@@ -1,6 +1,6 @@ |
| 62 |
# Copyright 1999-2013 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild,v 1.3 2013/12/28 22:56:42 mgorny Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3-r2.ebuild,v 1.4 2013/12/29 22:49:49 mgorny Exp $ |
| 66 |
|
| 67 |
EAPI=5 |
| 68 |
|
| 69 |
@@ -63,6 +63,11 @@ |
| 70 |
|
| 71 |
S=${WORKDIR}/${P}.src |
| 72 |
|
| 73 |
+# Some people actually override that in make.conf. That sucks since |
| 74 |
+# we need to run install per-directory, and ninja can't do that... |
| 75 |
+# so why did it call itself ninja in the first place? |
| 76 |
+CMAKE_MAKEFILE_GENERATOR=emake |
| 77 |
+ |
| 78 |
pkg_pretend() { |
| 79 |
# in megs |
| 80 |
# !clang !debug !multitarget -O2 400 |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.163 sys-devel/llvm/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.163&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.163&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.162&r2=1.163 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v |
| 93 |
retrieving revision 1.162 |
| 94 |
retrieving revision 1.163 |
| 95 |
diff -u -r1.162 -r1.163 |
| 96 |
--- ChangeLog 28 Dec 2013 22:56:42 -0000 1.162 |
| 97 |
+++ ChangeLog 29 Dec 2013 22:49:49 -0000 1.163 |
| 98 |
@@ -1,6 +1,11 @@ |
| 99 |
# ChangeLog for sys-devel/llvm |
| 100 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.162 2013/12/28 22:56:42 mgorny Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.163 2013/12/29 22:49:49 mgorny Exp $ |
| 103 |
+ |
| 104 |
+ 29 Dec 2013; Michał Górny <mgorny@g.o> llvm-3.3-r2.ebuild, |
| 105 |
+ llvm-9999.ebuild: |
| 106 |
+ Explicitly require Makefiles from CMake, to avoid failures when people like to |
| 107 |
+ enable ninja globally. Bug #496426. |
| 108 |
|
| 109 |
28 Dec 2013; Michał Górny <mgorny@g.o> llvm-3.3-r2.ebuild: |
| 110 |
Fix building R600 target, bug #496308. |
Archives