| 1 |
grobian 10/08/26 07:07:43 |
| 2 |
|
| 3 |
Modified: clang-9999.ebuild ChangeLog clang-2.7-r2.ebuild |
| 4 |
Log: |
| 5 |
Bump to EAPI=3, make Prefix aware, add support for Darwin platforms, bug #332605 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.15553-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-devel/clang/clang-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-9999.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: clang-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- clang-9999.ebuild 19 Aug 2010 19:32:20 -0000 1.5 |
| 23 |
+++ clang-9999.ebuild 26 Aug 2010 07:07:43 -0000 1.6 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.5 2010/08/19 19:32:20 voyageur Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.6 2010/08/26 07:07:43 grobian Exp $ |
| 29 |
|
| 30 |
-EAPI=2 |
| 31 |
+EAPI=3 |
| 32 |
|
| 33 |
RESTRICT_PYTHON_ABIS="3.*" |
| 34 |
SUPPORT_PYTHON_ABIS="1" |
| 35 |
@@ -53,7 +53,7 @@ |
| 36 |
# From llvm src_prepare |
| 37 |
einfo "Fixing install dirs" |
| 38 |
sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ |
| 39 |
- -e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \ |
| 40 |
+ -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ |
| 41 |
-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \ |
| 42 |
-i Makefile.config.in || die "Makefile.config sed failed" |
| 43 |
|
| 44 |
@@ -76,6 +76,12 @@ |
| 45 |
--disable-expensive-checks" |
| 46 |
fi |
| 47 |
|
| 48 |
+ # Setup the search path to include the Prefix includes |
| 49 |
+ if use prefix ; then |
| 50 |
+ CONF_FLAGS="${CONF_FLAGS} \ |
| 51 |
+ --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" |
| 52 |
+ fi |
| 53 |
+ |
| 54 |
if use amd64; then |
| 55 |
CONF_FLAGS="${CONF_FLAGS} --enable-pic" |
| 56 |
fi |
| 57 |
@@ -130,10 +136,19 @@ |
| 58 |
install-scan-view() { |
| 59 |
insinto "$(python_get_sitedir)"/clang |
| 60 |
doins Reporter.py Resources ScanView.py startfile.py |
| 61 |
- touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py |
| 62 |
+ touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py |
| 63 |
} |
| 64 |
python_execute_function install-scan-view |
| 65 |
fi |
| 66 |
+ |
| 67 |
+ # Fix install_names on Darwin. The build system is too complicated |
| 68 |
+ # to just fix this, so we correct it post-install |
| 69 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 70 |
+ for lib in libCIndex.dylib ; do |
| 71 |
+ install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \ |
| 72 |
+ "${ED}"/usr/lib/${lib} |
| 73 |
+ done |
| 74 |
+ fi |
| 75 |
} |
| 76 |
|
| 77 |
pkg_postinst() { |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.20 sys-devel/clang/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.20&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?rev=1.20&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/ChangeLog?r1=1.19&r2=1.20 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v |
| 90 |
retrieving revision 1.19 |
| 91 |
retrieving revision 1.20 |
| 92 |
diff -u -r1.19 -r1.20 |
| 93 |
--- ChangeLog 19 Aug 2010 19:32:20 -0000 1.19 |
| 94 |
+++ ChangeLog 26 Aug 2010 07:07:43 -0000 1.20 |
| 95 |
@@ -1,6 +1,11 @@ |
| 96 |
# ChangeLog for sys-devel/clang |
| 97 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.19 2010/08/19 19:32:20 voyageur Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.20 2010/08/26 07:07:43 grobian Exp $ |
| 100 |
+ |
| 101 |
+ 26 Aug 2010; Fabian Groffen <grobian@g.o> clang-2.7-r2.ebuild, |
| 102 |
+ clang-9999.ebuild: |
| 103 |
+ Bump to EAPI=3, make Prefix aware, add support for Darwin platforms, bug |
| 104 |
+ #332605 |
| 105 |
|
| 106 |
19 Aug 2010; Bernard Cafarelli <voyageur@g.o> clang-9999.ebuild: |
| 107 |
system-cxx-headers was missing in -9999 IUSE, spotted by Jack Lloyd |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.2 sys-devel/clang/clang-2.7-r2.ebuild |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild?rev=1.2&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild?rev=1.2&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild?r1=1.1&r2=1.2 |
| 116 |
|
| 117 |
Index: clang-2.7-r2.ebuild |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild,v |
| 120 |
retrieving revision 1.1 |
| 121 |
retrieving revision 1.2 |
| 122 |
diff -u -r1.1 -r1.2 |
| 123 |
--- clang-2.7-r2.ebuild 27 Jul 2010 13:06:47 -0000 1.1 |
| 124 |
+++ clang-2.7-r2.ebuild 26 Aug 2010 07:07:43 -0000 1.2 |
| 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/clang/clang-2.7-r2.ebuild,v 1.1 2010/07/27 13:06:47 voyageur Exp $ |
| 129 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.7-r2.ebuild,v 1.2 2010/08/26 07:07:43 grobian Exp $ |
| 130 |
|
| 131 |
-EAPI=2 |
| 132 |
+EAPI=3 |
| 133 |
|
| 134 |
RESTRICT_PYTHON_ABIS="3.*" |
| 135 |
SUPPORT_PYTHON_ABIS="1" |
| 136 |
@@ -17,7 +17,7 @@ |
| 137 |
|
| 138 |
LICENSE="UoI-NCSA" |
| 139 |
SLOT="0" |
| 140 |
-KEYWORDS="~amd64 ~x86" |
| 141 |
+KEYWORDS="~amd64 ~x86 ~ppc-macos" |
| 142 |
IUSE="debug +static-analyzer system-cxx-headers test" |
| 143 |
|
| 144 |
# Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html |
| 145 |
@@ -50,7 +50,7 @@ |
| 146 |
# From llvm src_prepare |
| 147 |
einfo "Fixing install dirs" |
| 148 |
sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ |
| 149 |
- -e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \ |
| 150 |
+ -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ |
| 151 |
-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \ |
| 152 |
-i Makefile.config.in || die "Makefile.config sed failed" |
| 153 |
|
| 154 |
@@ -73,6 +73,12 @@ |
| 155 |
--disable-expensive-checks" |
| 156 |
fi |
| 157 |
|
| 158 |
+ # Setup the search path to include the Prefix includes |
| 159 |
+ if use prefix ; then |
| 160 |
+ CONF_FLAGS="${CONF_FLAGS} \ |
| 161 |
+ --with-c-include-dirs=${EPREFIX}/usr/include:/usr/include" |
| 162 |
+ fi |
| 163 |
+ |
| 164 |
if use amd64; then |
| 165 |
CONF_FLAGS="${CONF_FLAGS} --enable-pic" |
| 166 |
fi |
| 167 |
@@ -127,10 +133,19 @@ |
| 168 |
install-scan-view() { |
| 169 |
insinto "$(python_get_sitedir)"/clang |
| 170 |
doins Reporter.py Resources ScanView.py startfile.py |
| 171 |
- touch "${D}"/"$(python_get_sitedir)"/clang/__init__.py |
| 172 |
+ touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py |
| 173 |
} |
| 174 |
python_execute_function install-scan-view |
| 175 |
fi |
| 176 |
+ |
| 177 |
+ # Fix install_names on Darwin. The build system is too complicated |
| 178 |
+ # to just fix this, so we correct it post-install |
| 179 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 180 |
+ for lib in libCIndex.dylib ; do |
| 181 |
+ install_name_tool -id "${EPREFIX}"/usr/lib/${lib} \ |
| 182 |
+ "${ED}"/usr/lib/${lib} |
| 183 |
+ done |
| 184 |
+ fi |
| 185 |
} |
| 186 |
|
| 187 |
pkg_postinst() { |
Archives