From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8C814198005 for ; Tue, 5 Mar 2013 05:42:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B989EE0682; Tue, 5 Mar 2013 05:42:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36969E0682 for ; Tue, 5 Mar 2013 05:42:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADE2433DC55 for ; Tue, 5 Mar 2013 05:42:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 451CCE4073 for ; Tue, 5 Mar 2013 05:42:53 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1362462172.9fb81d54c42312602d531f31dbdc29f2a758c76b.alexxy@gentoo> Subject: [gentoo-commits] proj/x11:opencl commit in: dev-libs/libclc/, dev-libs/libclc/files/ X-VCS-Repository: proj/x11 X-VCS-Files: dev-libs/libclc/files/fix-install-target.patch dev-libs/libclc/libclc-9999.ebuild X-VCS-Directories: dev-libs/libclc/ dev-libs/libclc/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 9fb81d54c42312602d531f31dbdc29f2a758c76b X-VCS-Branch: opencl Date: Tue, 5 Mar 2013 05:42:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d6601271-fb53-40cc-b7cb-dc0aee27736b X-Archives-Hash: 838e8f6a1404d4ba22e925d3000deb70 commit: 9fb81d54c42312602d531f31dbdc29f2a758c76b Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Mar 5 05:42:52 2013 +0000 Commit: Alexey Shvetsov gentoo 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() {