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 330681387B1 for ; Sun, 19 Oct 2014 05:55:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD2DFE0920; Sun, 19 Oct 2014 05:55:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D2B4E0920 for ; Sun, 19 Oct 2014 05:55:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04BC233F7F8 for ; Sun, 19 Oct 2014 05:55:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A4C4838E for ; Sun, 19 Oct 2014 05:55:20 +0000 (UTC) From: "Mark Wright" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mark Wright" Message-ID: <1413698099.800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569.gienah@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/openblas/ChangeLog sci-libs/openblas/openblas-0.2.12.ebuild sci-libs/openblas/openblas-9999.ebuild X-VCS-Directories: sci-libs/openblas/ X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright X-VCS-Revision: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569 X-VCS-Branch: master Date: Sun, 19 Oct 2014 05:55:20 +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: f47f760f-be0b-4f63-af50-6f079efc09fe X-Archives-Hash: 5f76e81e37c85c5430c86babd2d3280f commit: 800e8d3b47c5a01f7ff7e2ce6c7cd4a4b9d7a569 Author: gienah gentoo org> AuthorDate: Sun Oct 19 05:54:59 2014 +0000 Commit: Mark Wright gentoo org> CommitDate: Sun Oct 19 05:54:59 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=800e8d3b Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for reporting. The problem was that applying the -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() causes build failures on assembler code as the assembler does not understand sizeof(float). So delay applying the patch until src_install(). Bump openblas to 0.2.12. --- sci-libs/openblas/ChangeLog | 13 +++++++++++++ sci-libs/openblas/openblas-0.2.12.ebuild | 1 + sci-libs/openblas/openblas-9999.ebuild | 9 +++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 1af5fd9..1ad0bed 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -2,6 +2,19 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openblas-0.2.12 (19 Oct 2014) + + 19 Oct 2014; Mark Wright +openblas-0.2.12.ebuild, + openblas-9999.ebuild: + Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler + messages: ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing + ')', thanks to Juergen Rose, Jean-Francis Roy and Steven Trogdon for + reporting. The problem was that applying the + -0.2.11-openblas_config_header_same_between_ABIs.patch patch in src_prepare() + causes build failures on assembler code as the assembler does not understand + sizeof(float). So delay applying the patch until src_install(). Bump openblas + to 0.2.12. + 13 Oct 2014; Mark Wright openblas-9999.ebuild: Refactor openblas to use the fortran-int64.eclass. Move the virtuals from RDEPEND to PDEPEND to avoid circular dependencies. Specify the pkg-config diff --git a/sci-libs/openblas/openblas-0.2.12.ebuild b/sci-libs/openblas/openblas-0.2.12.ebuild new file mode 120000 index 0000000..2381753 --- /dev/null +++ b/sci-libs/openblas/openblas-0.2.12.ebuild @@ -0,0 +1 @@ +openblas-9999.ebuild \ No newline at end of file diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild index a33e449..5843200 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -80,10 +80,9 @@ src_unpack() { src_prepare() { local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) ) epatch "${DISTDIR}/${PN}-0.2.11-gentoo.patch" - if [[ ${PV} != "9999" ]] ; then + if [[ ${PV} == "0.2.11" ]] ; then epatch "${FILESDIR}/${PN}-0.2.11-cpuid_x86.patch" fi - epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch" # lapack and lapacke are not modified from upstream lapack sed \ -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \ @@ -160,6 +159,12 @@ src_test() { src_install() { local MULTIBUILD_VARIANTS=( $(fortran-int64_multilib_get_enabled_abis) ) my_src_install() { + # Fix Bug 524612 - [science overlay] sci-libs/openblas-0.2.11 - Assembler messages: + # ../kernel/x86_64/gemm_kernel_8x4_barcelona.S:451: Error: missing ')' + # The problem is applying this patch in src_prepare() causes build failures on + # assembler code as the assembler does not understand sizeof(float). So + # delay applying the patch until src_install(). + epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch" local openblas_flags=$(get_openblas_flags) local profname=$(fortran-int64_get_profname) local pcfile