commit: c035b265ecc77dbab84a3492829d7de9a0c217e3 Author: gienah <gienah <AT> gentoo <DOT> org> AuthorDate: Sun Oct 19 10:20:52 2014 +0000 Commit: Mark Wright <gienah <AT> gentoo <DOT> org> CommitDate: Sun Oct 19 10:20:52 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c035b265
The fix for Bug 524612 failed in src_install building openblas from git. The fix is to move applying the patch to src_compile after building the library, then remove config.h and config_last.h; make config.h - ignoring the spurious warning; then cp config.h to config_last.h. --- sci-libs/openblas/ChangeLog | 6 ++++++ sci-libs/openblas/openblas-9999.ebuild | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index 1ad0bed..cc7349a 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Oct 2014; Mark Wright <[email protected]> openblas-9999.ebuild: + The fix for Bug 524612 failed in src_install building openblas from git. The + fix is to move applying the patch to src_compile after building the library, + then remove config.h and config_last.h; make config.h - ignoring the spurious + warning; then cp config.h to config_last.h. + *openblas-0.2.12 (19 Oct 2014) 19 Oct 2014; Mark Wright <[email protected]> +openblas-0.2.12.ebuild, diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild index 5843200..7c22ca6 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -125,6 +125,16 @@ src_compile() { emake libs ${openblas_flags} NO_SHARED=1 NEED_PIC= mv libopenblas* libs/ fi + # 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 after building the libraries. + epatch "${FILESDIR}/${PN}-0.2.11-openblas_config_header_same_between_ABIs.patch" + rm -f config.h config_last.h + # Note: prints this spurious warning: make: Nothing to be done for 'config.h'. + emake config.h + cp config.h config_last.h || die cat <<-EOF > ${profname}.pc prefix=${EPREFIX}/usr libdir=\${prefix}/$(get_libdir) @@ -159,12 +169,6 @@ 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
