1 |
commit: 9fb81d54c42312602d531f31dbdc29f2a758c76b |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 5 05:42:52 2013 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 5 05:42:52 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9fb81d54 |
7 |
|
8 |
Update to recent changes for libclc |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha166 |
11 |
|
12 |
--- |
13 |
dev-libs/libclc/files/fix-install-target.patch | 45 ------------------------ |
14 |
dev-libs/libclc/libclc-9999.ebuild | 9 ++--- |
15 |
2 files changed, 4 insertions(+), 50 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/libclc/files/fix-install-target.patch b/dev-libs/libclc/files/fix-install-target.patch |
18 |
deleted file mode 100644 |
19 |
index f294104..0000000 |
20 |
--- a/dev-libs/libclc/files/fix-install-target.patch |
21 |
+++ /dev/null |
22 |
@@ -1,45 +0,0 @@ |
23 |
-diff --git a/configure.py b/configure.py |
24 |
-index 546bbd3..dcb9f48 100755 |
25 |
---- a/configure.py |
26 |
-+++ b/configure.py |
27 |
-@@ -7,7 +7,11 @@ def c_compiler_rule(b, name, description, compiler, flags): |
28 |
- from optparse import OptionParser |
29 |
- import os |
30 |
- from subprocess import * |
31 |
--import sys |
32 |
-+import sys, platform |
33 |
-+ |
34 |
-+system_libdir = 'lib' |
35 |
-+if platform.machine() in ('x86_64',): |
36 |
-+ system_libdir = 'lib64' |
37 |
- |
38 |
- srcdir = os.path.dirname(sys.argv[0]) |
39 |
- |
40 |
-@@ -94,7 +98,7 @@ for target in targets: |
41 |
- [os.path.join(srcdir, subdir, 'lib') for subdir in subdirs]) |
42 |
- |
43 |
- clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs]) |
44 |
-- install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs] |
45 |
-+ install_files += [(incdir, '') for incdir in incdirs] |
46 |
- |
47 |
- # The rule for building a .bc file for the specified architecture using clang. |
48 |
- clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \ |
49 |
-@@ -129,15 +133,14 @@ for target in targets: |
50 |
- b.build(builtins_link_bc, "LLVM_LINK", objects) |
51 |
- b.build(builtins_opt_bc, "OPT", builtins_link_bc) |
52 |
- b.build(builtins_bc, "PREPARE_BUILTINS", builtins_opt_bc, prepare_builtins) |
53 |
-- install_files.append((builtins_bc, builtins_bc)) |
54 |
-+ install_files.append((builtins_bc, '%s/clc/%s' % (system_libdir, target))) |
55 |
- install_deps.append(builtins_bc) |
56 |
- b.default(builtins_bc) |
57 |
- |
58 |
- if options.prefix: |
59 |
-- install_cmd = ' && '.join(['mkdir -p %(dst)s && cp -r %(src)s %(dst)s' % |
60 |
-+ install_cmd = ' && '.join(['mkdir -p $(DESTDIR)/%(dst)s && cp -r %(src)s $(DESTDIR)/%(dst)s' % |
61 |
- {'src': file, |
62 |
-- 'dst': os.path.join(options.prefix, |
63 |
-- os.path.dirname(dest))} |
64 |
-+ 'dst': os.path.join(options.prefix, dest)} |
65 |
- for (file, dest) in install_files]) |
66 |
- b.rule('install', command = install_cmd, description = 'INSTALL') |
67 |
- b.build('install', 'install', install_deps) |
68 |
\ No newline at end of file |
69 |
|
70 |
diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild |
71 |
index b8108e2..54b6929 100644 |
72 |
--- a/dev-libs/libclc/libclc-9999.ebuild |
73 |
+++ b/dev-libs/libclc/libclc-9999.ebuild |
74 |
@@ -1,8 +1,8 @@ |
75 |
-# Copyright 1999-2012 Gentoo Foundation |
76 |
+# Copyright 1999-2013 Gentoo Foundation |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
# $Header: $ |
79 |
|
80 |
-EAPI=4 |
81 |
+EAPI=5 |
82 |
|
83 |
EGIT_REPO_URI="git://people.freedesktop.org/~tstellar/${PN}" |
84 |
|
85 |
@@ -28,13 +28,12 @@ KEYWORDS="~amd64 ~x86" |
86 |
IUSE="" |
87 |
|
88 |
RDEPEND=" |
89 |
- >=sys-devel/clang-3.1 |
90 |
- >=sys-devel/llvm-3.1" |
91 |
+ >=sys-devel/clang-3.2 |
92 |
+ >=sys-devel/llvm-3.2" |
93 |
DEPEND="${RDEPEND}" |
94 |
|
95 |
PATCHES=( |
96 |
"${FILESDIR}/0001-Rename-target-to-r600-amd-none.patch" |
97 |
- "${FILESDIR}/fix-install-target.patch" |
98 |
) |
99 |
|
100 |
src_configure() { |