[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     e094637ff0446a76121a92051fbee910b94f7d0d
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 23:30:36 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 23:30:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e094637f

Add install target patch

(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)

---
 .../0001-configure.py-Add-an-install-rule.patch    |  123 ++++++++++++++++++++
 dev-libs/libclc/libclc-9999.ebuild                 |    6 +-
 2 files changed, 128 insertions(+), 1 deletions(-)

diff --git a/dev-libs/libclc/files/0001-configure.py-Add-an-install-rule.patch b/dev-libs/libclc/files/0001-configure.py-Add-an-install-rule.patch
new file mode 100644
index 0000000..d11d5f7
--- /dev/null
+++ b/dev-libs/libclc/files/0001-configure.py-Add-an-install-rule.patch
@@ -0,0 +1,123 @@
+From a5680175111af8b293dd9cd07eb8f465dda7d86b Mon Sep 17 00:00:00 2001
+From: Peter Collingbourne <peter@pcc.me.uk>
+Date: Fri, 1 Jun 2012 17:29:59 +0000
+Subject: [PATCH] configure.py: Add an install rule.
+
+git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@157821 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ build/metabuild.py |    6 +++++-
+ configure.py       |   37 ++++++++++++++++++++++++++-----------
+ 2 files changed, 31 insertions(+), 12 deletions(-)
+
+diff --git a/build/metabuild.py b/build/metabuild.py
+index 65870ac..c675e09 100644
+--- a/build/metabuild.py
++++ b/build/metabuild.py
+@@ -9,6 +9,7 @@ class Make(object):
+     self.rules = {}
+     self.rule_text = ''
+     self.all_targets = []
++    self.default_targets = []
+     self.clean_files = []
+     self.distclean_files = []
+     self.output.write("""all::
+@@ -68,8 +69,11 @@ endif
+       return input
+     return [input]
+ 
++  def default(self, paths):
++    self.default_targets += self._as_list(paths)
++
+   def finish(self):
+-    self.output.write('all:: %s\n\n' % ' '.join(self.all_targets))
++    self.output.write('all:: %s\n\n' % ' '.join(self.default_targets or self.all_targets))
+     self.output.write('clean: \n\trm -f %s\n\n' % ' '.join(self.clean_files))
+     self.output.write('distclean: clean\n\trm -f %s\n' % ' '.join(self.distclean_files))
+ 
+diff --git a/configure.py b/configure.py
+index ab84a0d..546bbd3 100755
+--- a/configure.py
++++ b/configure.py
+@@ -17,6 +17,8 @@ import metabuild
+ p = OptionParser()
+ p.add_option('--with-llvm-config', metavar='PATH',
+              help='use given llvm-config script')
++p.add_option('--prefix', metavar='PATH',
++             help='install to given prefix')
+ p.add_option('-g', metavar='GENERATOR', default='make',
+              help='use given generator (default: make)')
+ (options, args) = p.parse_args()
+@@ -70,6 +72,9 @@ b.rule("PREPARE_BUILTINS", "%s -o $out $in" % prepare_builtins,
+ manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build', 'metabuild.py'),
+                      os.path.join(srcdir, 'build', 'ninja_syntax.py')])
+ 
++install_files = []
++install_deps = []
++
+ for target in targets:
+   (t_arch, t_vendor, t_os) = target.split('-')
+   archs = [t_arch]
+@@ -83,12 +88,13 @@ for target in targets:
+     subdirs.append("%s-%s" % (arch, t_os))
+     subdirs.append(arch)
+ 
+-  subdirs = [subdir for subdir in subdirs
+-             if os.path.isdir(os.path.join(srcdir, subdir, 'include')) or
+-                os.path.isfile(os.path.join(srcdir, subdir, 'lib', 'SOURCES'))]
++  incdirs = filter(os.path.isdir,
++               [os.path.join(srcdir, subdir, 'include') for subdir in subdirs])
++  libdirs = filter(lambda d: os.path.isfile(os.path.join(d, 'SOURCES')),
++                   [os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
+ 
+-  clang_cl_includes = ' '.join(["-I%s" % os.path.join(srcdir, subdir, 'include')
+-                                for subdir in subdirs])
++  clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs])
++  install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
+ 
+   # The rule for building a .bc file for the specified architecture using clang.
+   clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \
+@@ -101,11 +107,8 @@ for target in targets:
+   objects = []
+   sources_seen = set()
+ 
+-  for subdir in subdirs:
+-    src_libdir = os.path.join(srcdir, subdir, 'lib')
+-    if not os.path.isdir(src_libdir):
+-      continue
+-    subdir_list_file = os.path.join(src_libdir, 'SOURCES')
++  for libdir in libdirs:
++    subdir_list_file = os.path.join(libdir, 'SOURCES')
+     manifest_deps.add(subdir_list_file)
+     for src in open(subdir_list_file).readlines():
+       src = src.rstrip()
+@@ -113,7 +116,7 @@ for target in targets:
+         sources_seen.add(src)
+         obj = os.path.join(target, 'lib', src + '.bc')
+         objects.append(obj)
+-        src_file = os.path.join(src_libdir, src)
++        src_file = os.path.join(libdir, src)
+         ext = os.path.splitext(src)[1]
+         if ext == '.ll':
+           b.build(obj, 'LLVM_AS', src_file)
+@@ -126,6 +129,18 @@ for target in targets:
+   b.build(builtins_link_bc, "LLVM_LINK", objects)
+   b.build(builtins_opt_bc, "OPT", builtins_link_bc)
+   b.build(builtins_bc, "PREPARE_BUILTINS", builtins_opt_bc, prepare_builtins)
++  install_files.append((builtins_bc, builtins_bc))
++  install_deps.append(builtins_bc)
++  b.default(builtins_bc)
++
++if options.prefix:
++  install_cmd = ' && '.join(['mkdir -p %(dst)s && cp -r %(src)s %(dst)s' % 
++                             {'src': file,
++                              'dst': os.path.join(options.prefix,
++                                                  os.path.dirname(dest))}
++                             for (file, dest) in install_files])
++  b.rule('install', command = install_cmd, description = 'INSTALL')
++  b.build('install', 'install', install_deps)
+ 
+ b.rule("configure", command = ' '.join(sys.argv), description = 'CONFIGURE',
+        generator = True)
+-- 
+1.7.10.2
+

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index d8b7ed4..caacddb 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit $GIT_ECLASS
+inherit base $GIT_ECLASS
 
 DESCRIPTION="OpenCL C library"
 HOMEPAGE="http://libclc.llvm.org/"
@@ -32,6 +32,10 @@ RDEPEND="
 	>=sys-devel/llvm-3.1"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+		"${FILESDIR}/0001-configure.py-Add-an-install-rule.patch"
+)
+
 src_configure() {
 	./configure.py --with-llvm-config="${EPREFIX}/usr/bin/llvm-config"
 }

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     eb59f4fe6bf1bf5fb56634da398649326298467c
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 10:52:09 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 10:52:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=eb59f4fe

also add patch for target renaming here

(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)

---
 .../0001-Rename-target-to-r600-amd-none.patch      |   25 ++++++++++++++++++++
 dev-libs/libclc/libclc-9999.ebuild                 |    1 +
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch b/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch
new file mode 100644
index 0000000..77d5ce3
--- /dev/null
+++ b/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch
@@ -0,0 +1,25 @@
+From 14e7b789aa859c53b09bb885fc1d2266c3097038 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Sun, 3 Jun 2012 14:49:53 +0400
+Subject: [PATCH] Rename target to r600-amd-none
+
+---
+ configure.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.py b/configure.py
+index 0d05e0c..5aded9c 100755
+--- a/configure.py
++++ b/configure.py
+@@ -40,7 +40,7 @@ llvm_clang = os.path.join(llvm_bindir, 'clang')
+ llvm_link = os.path.join(llvm_bindir, 'llvm-link')
+ llvm_opt = os.path.join(llvm_bindir, 'opt')
+ 
+-default_targets = ['r600--']
++default_targets = ['r600-amd-none']
+ 
+ targets = args
+ if not targets:
+-- 
+1.7.10.2
+

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 067d12a..95b1c2e 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 		"${FILESDIR}/0001-configure.py-Add-an-install-rule.patch"
+		"${FILESDIR}/0001-Rename-target-to-r600-amd-none.patch"
 )
 
 src_configure() {

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     3aa161c506d3782bdbaa0a6c3b8f6c9ec4bf5b28
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 11:46:26 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 11:46:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3aa161c5

Add patch from maksbotan to fix install target

(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit)

---
 dev-libs/libclc/files/fix-install-target.patch |   45 ++++++++++++++++++++++++
 dev-libs/libclc/libclc-9999.ebuild             |    9 +----
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libclc/files/fix-install-target.patch b/dev-libs/libclc/files/fix-install-target.patch
new file mode 100644
index 0000000..f294104
--- /dev/null
+++ b/dev-libs/libclc/files/fix-install-target.patch
@@ -0,0 +1,45 @@
+diff --git a/configure.py b/configure.py
+index 546bbd3..dcb9f48 100755
+--- a/configure.py
++++ b/configure.py
+@@ -7,7 +7,11 @@ def c_compiler_rule(b, name, description, compiler, flags):
+ from optparse import OptionParser
+ import os
+ from subprocess import *
+-import sys
++import sys, platform
++
++system_libdir = 'lib'
++if platform.machine() in ('x86_64',):
++    system_libdir = 'lib64'
+ 
+ srcdir = os.path.dirname(sys.argv[0])
+ 
+@@ -94,7 +98,7 @@ for target in targets:
+                    [os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
+ 
+   clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs])
+-  install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
++  install_files += [(incdir, '') for incdir in incdirs]
+ 
+   # The rule for building a .bc file for the specified architecture using clang.
+   clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \
+@@ -129,15 +133,14 @@ for target in targets:
+   b.build(builtins_link_bc, "LLVM_LINK", objects)
+   b.build(builtins_opt_bc, "OPT", builtins_link_bc)
+   b.build(builtins_bc, "PREPARE_BUILTINS", builtins_opt_bc, prepare_builtins)
+-  install_files.append((builtins_bc, builtins_bc))
++  install_files.append((builtins_bc, '%s/clc/%s' % (system_libdir, target)))
+   install_deps.append(builtins_bc)
+   b.default(builtins_bc)
+ 
+ if options.prefix:
+-  install_cmd = ' && '.join(['mkdir -p %(dst)s && cp -r %(src)s %(dst)s' % 
++  install_cmd = ' && '.join(['mkdir -p $(DESTDIR)/%(dst)s && cp -r %(src)s $(DESTDIR)/%(dst)s' %
+                              {'src': file,
+-                              'dst': os.path.join(options.prefix,
+-                                                  os.path.dirname(dest))}
++                              'dst': os.path.join(options.prefix, dest)}
+                              for (file, dest) in install_files])
+   b.rule('install', command = install_cmd, description = 'INSTALL')
+   b.build('install', 'install', install_deps)
\ No newline at end of file

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 566cfc5..b15688c 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 		"${FILESDIR}/0001-configure.py-Add-an-install-rule.patch"
 		"${FILESDIR}/0001-Rename-target-to-r600-amd-none.patch"
+		"${FILESDIR}/fix-install-target.patch"
 )
 
 src_configure() {
@@ -42,11 +43,3 @@ src_configure() {
 		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
 		--prefix="${EPREFIX}/usr"
 }
-
-src_install() {
-	# it has UGY install target so we use own one
-	insinto /usr/include
-	doins -r generic/include/*
-	insinto /usr/$(get_libdir)/clc/r600-amd-none
-	doins r600-amd-none/lib/builtins.bc
-}

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     9fb81d54c42312602d531f31dbdc29f2a758c76b
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  5 05:42:52 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 05:42:52 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9fb81d54

Update to recent changes for libclc

Package-Manager: portage-2.2.0_alpha166

---
 dev-libs/libclc/files/fix-install-target.patch |   45 ------------------------
 dev-libs/libclc/libclc-9999.ebuild             |    9 ++---
 2 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/dev-libs/libclc/files/fix-install-target.patch b/dev-libs/libclc/files/fix-install-target.patch
deleted file mode 100644
index f294104..0000000
--- a/dev-libs/libclc/files/fix-install-target.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/configure.py b/configure.py
-index 546bbd3..dcb9f48 100755
---- a/configure.py
-+++ b/configure.py
-@@ -7,7 +7,11 @@ def c_compiler_rule(b, name, description, compiler, flags):
- from optparse import OptionParser
- import os
- from subprocess import *
--import sys
-+import sys, platform
-+
-+system_libdir = 'lib'
-+if platform.machine() in ('x86_64',):
-+    system_libdir = 'lib64'
- 
- srcdir = os.path.dirname(sys.argv[0])
- 
-@@ -94,7 +98,7 @@ for target in targets:
-                    [os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
- 
-   clang_cl_includes = ' '.join(["-I%s" % incdir for incdir in incdirs])
--  install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
-+  install_files += [(incdir, '') for incdir in incdirs]
- 
-   # The rule for building a .bc file for the specified architecture using clang.
-   clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \
-@@ -129,15 +133,14 @@ for target in targets:
-   b.build(builtins_link_bc, "LLVM_LINK", objects)
-   b.build(builtins_opt_bc, "OPT", builtins_link_bc)
-   b.build(builtins_bc, "PREPARE_BUILTINS", builtins_opt_bc, prepare_builtins)
--  install_files.append((builtins_bc, builtins_bc))
-+  install_files.append((builtins_bc, '%s/clc/%s' % (system_libdir, target)))
-   install_deps.append(builtins_bc)
-   b.default(builtins_bc)
- 
- if options.prefix:
--  install_cmd = ' && '.join(['mkdir -p %(dst)s && cp -r %(src)s %(dst)s' % 
-+  install_cmd = ' && '.join(['mkdir -p $(DESTDIR)/%(dst)s && cp -r %(src)s $(DESTDIR)/%(dst)s' %
-                              {'src': file,
--                              'dst': os.path.join(options.prefix,
--                                                  os.path.dirname(dest))}
-+                              'dst': os.path.join(options.prefix, dest)}
-                              for (file, dest) in install_files])
-   b.rule('install', command = install_cmd, description = 'INSTALL')
-   b.build('install', 'install', install_deps)
\ No newline at end of file

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index b8108e2..54b6929 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 EGIT_REPO_URI="git://people.freedesktop.org/~tstellar/${PN}"
 
@@ -28,13 +28,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=sys-devel/clang-3.1
-	>=sys-devel/llvm-3.1"
+	>=sys-devel/clang-3.2
+	>=sys-devel/llvm-3.2"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 		"${FILESDIR}/0001-Rename-target-to-r600-amd-none.patch"
-		"${FILESDIR}/fix-install-target.patch"
 )
 
 src_configure() {

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     a6a7716cfa7663a111679197f2921d8f38ca0bf2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  6 11:29:38 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Apr  6 11:29:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6a7716c

Drop unneded patches

Package-Manager: portage-2.2.0_alpha171

---
 .../0001-Rename-target-to-r600-amd-none.patch      |   25 --------------------
 dev-libs/libclc/libclc-9999.ebuild                 |    4 ---
 2 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch b/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch
deleted file mode 100644
index 77d5ce3..0000000
--- a/dev-libs/libclc/files/0001-Rename-target-to-r600-amd-none.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 14e7b789aa859c53b09bb885fc1d2266c3097038 Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@gentoo.org>
-Date: Sun, 3 Jun 2012 14:49:53 +0400
-Subject: [PATCH] Rename target to r600-amd-none
-
----
- configure.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.py b/configure.py
-index 0d05e0c..5aded9c 100755
---- a/configure.py
-+++ b/configure.py
-@@ -40,7 +40,7 @@ llvm_clang = os.path.join(llvm_bindir, 'clang')
- llvm_link = os.path.join(llvm_bindir, 'llvm-link')
- llvm_opt = os.path.join(llvm_bindir, 'opt')
- 
--default_targets = ['r600--']
-+default_targets = ['r600-amd-none']
- 
- targets = args
- if not targets:
--- 
-1.7.10.2
-

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 54b6929..0901372 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -32,10 +32,6 @@ RDEPEND="
 	>=sys-devel/llvm-3.2"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-		"${FILESDIR}/0001-Rename-target-to-r600-amd-none.patch"
-)
-
 src_configure() {
 	./configure.py \
 		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     45f5621aa0371b8d25dd4baf1529034a13320b52
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 03:50:34 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 03:50:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=45f5621a

Add patch to make bfgminer work

Package-Manager: portage-2.2.0_alpha171

---
 .../r600-fix-get_group_id-and-get_local_size.patch |   64 ++++++++++++++++++++
 dev-libs/libclc/libclc-9999.ebuild                 |    4 +
 2 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch b/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch
new file mode 100644
index 0000000..79742cd
--- /dev/null
+++ b/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch
@@ -0,0 +1,64 @@
+From f66311f8f1fa4590c7e94da9b50ace728aaed1ae Mon Sep 17 00:00:00 2001
+From: Tom Stellard <thomas.stellard@amd.com>
+Date: Wed, 10 Apr 2013 19:18:12 +0000
+Subject: r600: Fix implementations of get_group_id.ll and get_local_size.ll
+
+---
+diff --git a/r600/lib/workitem/get_group_id.ll b/r600/lib/workitem/get_group_id.ll
+index 5131648..0dc86e5 100644
+--- a/r600/lib/workitem/get_group_id.ll
++++ b/r600/lib/workitem/get_group_id.ll
+@@ -1,17 +1,17 @@
+-declare i32 @llvm.r600.read.local.size.x() nounwind readnone
+-declare i32 @llvm.r600.read.local.size.y() nounwind readnone
+-declare i32 @llvm.r600.read.local.size.z() nounwind readnone
++declare i32 @llvm.r600.read.tgid.x() nounwind readnone
++declare i32 @llvm.r600.read.tgid.y() nounwind readnone
++declare i32 @llvm.r600.read.tgid.z() nounwind readnone
+ 
+ define i32 @get_group_id(i32 %dim) nounwind readnone alwaysinline {
+   switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim]
+ x_dim:
+-  %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone
++  %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone
+   ret i32 %x
+ y_dim:
+-  %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone
++  %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone
+   ret i32 %y
+ z_dim:
+-  %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone
++  %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone
+   ret i32 %z
+ default:
+   ret i32 0
+diff --git a/r600/lib/workitem/get_local_size.ll b/r600/lib/workitem/get_local_size.ll
+index 6a71f75..0a98de6 100644
+--- a/r600/lib/workitem/get_local_size.ll
++++ b/r600/lib/workitem/get_local_size.ll
+@@ -1,17 +1,17 @@
+-declare i32 @llvm.r600.read.tgid.x() nounwind readnone
+-declare i32 @llvm.r600.read.tgid.y() nounwind readnone
+-declare i32 @llvm.r600.read.tgid.z() nounwind readnone
++declare i32 @llvm.r600.read.local.size.x() nounwind readnone
++declare i32 @llvm.r600.read.local.size.y() nounwind readnone
++declare i32 @llvm.r600.read.local.size.z() nounwind readnone
+ 
+ define i32 @get_local_size(i32 %dim) nounwind readnone alwaysinline {
+   switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim]
+ x_dim:
+-  %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone
++  %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone
+   ret i32 %x
+ y_dim:
+-  %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone
++  %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone
+   ret i32 %y
+ z_dim:
+-  %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone
++  %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone
+   ret i32 %z
+ default:
+   ret i32 0
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 0901372..09c3148 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
 	>=sys-devel/llvm-3.2"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/r600-fix-get_group_id-and-get_local_size.patch"
+)
+
 src_configure() {
 	./configure.py \
 		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \

[gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/

[Alexey Shvetsov]

commit:     893e61a9d9c48daabb9f88517a23967113fb43c2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 20:33:47 2013 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri May  3 20:33:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=893e61a9

This patch was merged to master

Package-Manager: portage-2.2.0_alpha173

---
 .../r600-fix-get_group_id-and-get_local_size.patch |   64 --------------------
 dev-libs/libclc/libclc-9999.ebuild                 |    4 -
 2 files changed, 0 insertions(+), 68 deletions(-)

diff --git a/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch b/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch
deleted file mode 100644
index 79742cd..0000000
--- a/dev-libs/libclc/files/r600-fix-get_group_id-and-get_local_size.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f66311f8f1fa4590c7e94da9b50ace728aaed1ae Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 10 Apr 2013 19:18:12 +0000
-Subject: r600: Fix implementations of get_group_id.ll and get_local_size.ll
-
----
-diff --git a/r600/lib/workitem/get_group_id.ll b/r600/lib/workitem/get_group_id.ll
-index 5131648..0dc86e5 100644
---- a/r600/lib/workitem/get_group_id.ll
-+++ b/r600/lib/workitem/get_group_id.ll
-@@ -1,17 +1,17 @@
--declare i32 @llvm.r600.read.local.size.x() nounwind readnone
--declare i32 @llvm.r600.read.local.size.y() nounwind readnone
--declare i32 @llvm.r600.read.local.size.z() nounwind readnone
-+declare i32 @llvm.r600.read.tgid.x() nounwind readnone
-+declare i32 @llvm.r600.read.tgid.y() nounwind readnone
-+declare i32 @llvm.r600.read.tgid.z() nounwind readnone
- 
- define i32 @get_group_id(i32 %dim) nounwind readnone alwaysinline {
-   switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim]
- x_dim:
--  %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone
-+  %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone
-   ret i32 %x
- y_dim:
--  %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone
-+  %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone
-   ret i32 %y
- z_dim:
--  %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone
-+  %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone
-   ret i32 %z
- default:
-   ret i32 0
-diff --git a/r600/lib/workitem/get_local_size.ll b/r600/lib/workitem/get_local_size.ll
-index 6a71f75..0a98de6 100644
---- a/r600/lib/workitem/get_local_size.ll
-+++ b/r600/lib/workitem/get_local_size.ll
-@@ -1,17 +1,17 @@
--declare i32 @llvm.r600.read.tgid.x() nounwind readnone
--declare i32 @llvm.r600.read.tgid.y() nounwind readnone
--declare i32 @llvm.r600.read.tgid.z() nounwind readnone
-+declare i32 @llvm.r600.read.local.size.x() nounwind readnone
-+declare i32 @llvm.r600.read.local.size.y() nounwind readnone
-+declare i32 @llvm.r600.read.local.size.z() nounwind readnone
- 
- define i32 @get_local_size(i32 %dim) nounwind readnone alwaysinline {
-   switch i32 %dim, label %default [i32 0, label %x_dim i32 1, label %y_dim i32 2, label %z_dim]
- x_dim:
--  %x = call i32 @llvm.r600.read.tgid.x() nounwind readnone
-+  %x = call i32 @llvm.r600.read.local.size.x() nounwind readnone
-   ret i32 %x
- y_dim:
--  %y = call i32 @llvm.r600.read.tgid.y() nounwind readnone
-+  %y = call i32 @llvm.r600.read.local.size.y() nounwind readnone
-   ret i32 %y
- z_dim:
--  %z = call i32 @llvm.r600.read.tgid.z() nounwind readnone
-+  %z = call i32 @llvm.r600.read.local.size.z() nounwind readnone
-   ret i32 %z
- default:
-   ret i32 0
---
-cgit v0.9.0.2-2-gbebe

diff --git a/dev-libs/libclc/libclc-9999.ebuild b/dev-libs/libclc/libclc-9999.ebuild
index 09c3148..0901372 100644
--- a/dev-libs/libclc/libclc-9999.ebuild
+++ b/dev-libs/libclc/libclc-9999.ebuild
@@ -32,10 +32,6 @@ RDEPEND="
 	>=sys-devel/llvm-3.2"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/r600-fix-get_group_id-and-get_local_size.patch"
-)
-
 src_configure() {
 	./configure.py \
 		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \