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 8DE6B1381F3 for ; Mon, 2 Sep 2013 19:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 545C2E0C06; Mon, 2 Sep 2013 19:17:45 +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 C15E1E0C06 for ; Mon, 2 Sep 2013 19:17:44 +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 821E633EE55 for ; Mon, 2 Sep 2013 19:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 38287E468F for ; Mon, 2 Sep 2013 19:17:42 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1378149452.36d95ed46734e64b54d67cde8bd3b40fe093f8e0.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/fftw/ChangeLog sci-libs/fftw/fftw-3.3.3-r3.ebuild sci-libs/fftw/fftw-9999.ebuild X-VCS-Directories: sci-libs/fftw/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 36d95ed46734e64b54d67cde8bd3b40fe093f8e0 X-VCS-Branch: master Date: Mon, 2 Sep 2013 19:17:42 +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: 2f7aee08-af1f-4ea4-b23f-90e6c7b12ee9 X-Archives-Hash: b99388b5b7ee181f6057831977508269 commit: 36d95ed46734e64b54d67cde8bd3b40fe093f8e0 Author: Christoph Junghans gentoo org> AuthorDate: Mon Sep 2 19:11:49 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Sep 2 19:17:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36d95ed4 clean up Package-Manager: portage-2.2.1 --- sci-libs/fftw/ChangeLog | 4 ++++ sci-libs/fftw/fftw-3.3.3-r3.ebuild | 38 +++++++++++++++++--------------------- sci-libs/fftw/fftw-9999.ebuild | 38 +++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog index d82a81d..1d66bfd 100644 --- a/sci-libs/fftw/ChangeLog +++ b/sci-libs/fftw/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Sep 2013; Christoph Junghans fftw-3.3.3-r3.ebuild, + fftw-9999.ebuild: + clean up + *fftw-3.3.3-r3 (01 Sep 2013) *fftw-9999 (01 Sep 2013) diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild index 9af7694..c839eb5 100644 --- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r3.ebuild @@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/fftw3-mpi.h /usr/include/fftw3l-mpi.f03 /usr/include/fftw3-mpi.f03 + /usr/include/fftw3l.f03 /usr/include/fftw3q.f03 ) @@ -90,7 +91,14 @@ src_configure() { multilib_is_native_abi || enable_mpi="--disable-mpi" #jlec reported USE=quad on abi_x86_32 has too less registers - multilib_is_native_abi || [[ $x != quad ]] || return 0 + #stub Makefiles + if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then + mkdir -p "${BUILD_DIR}/tests" || die + echo "all: ;" > "${BUILD_DIR}/Makefile" || die + echo "install: ;" >> "${BUILD_DIR}/Makefile" || die + echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die + return 0 + fi myeconfargs=( $(use_enable fma) @@ -140,14 +148,8 @@ src_configure() { multibuild_foreach_variant my_abi_configure } -abi_has_precision() { - #not all abi have all precisions - [[ -f ${BUILD_DIR}/Makefile ]] || return 0 - "$@" -} - src_compile() { - multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile + multibuild_foreach_variant autotools-multilib_src_compile } src_test () { @@ -156,7 +158,7 @@ src_test () { # Do not increase the number of threads, it will not help your performance #local testbase="perl check.pl --nthreads=1 --estimate" # ${testbase} -${p}d || die "Failure: $n" - multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck + multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck } src_install () { @@ -166,19 +168,13 @@ src_install () { #copied from autotools-multilib_secure_install my_abi_src_install() { - my_abi_secure_install() { - autotools-utils_src_install - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - multilib_check_headers - fi - } - - multilib_foreach_abi abi_has_precision my_abi_secure_install - #don't mix checksum of different precisions - rm -f "${T}"/.multilib_header_cksum + autotools-utils_src_install + if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then + multilib_prepare_wrappers + multilib_check_headers + fi } - multibuild_foreach_variant my_abi_src_install + multibuild_foreach_variant multilib_foreach_abi my_abi_src_install multilib_install_wrappers if use doc; then diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild index 9af7694..c839eb5 100644 --- a/sci-libs/fftw/fftw-9999.ebuild +++ b/sci-libs/fftw/fftw-9999.ebuild @@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/fftw3-mpi.h /usr/include/fftw3l-mpi.f03 /usr/include/fftw3-mpi.f03 + /usr/include/fftw3l.f03 /usr/include/fftw3q.f03 ) @@ -90,7 +91,14 @@ src_configure() { multilib_is_native_abi || enable_mpi="--disable-mpi" #jlec reported USE=quad on abi_x86_32 has too less registers - multilib_is_native_abi || [[ $x != quad ]] || return 0 + #stub Makefiles + if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then + mkdir -p "${BUILD_DIR}/tests" || die + echo "all: ;" > "${BUILD_DIR}/Makefile" || die + echo "install: ;" >> "${BUILD_DIR}/Makefile" || die + echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die + return 0 + fi myeconfargs=( $(use_enable fma) @@ -140,14 +148,8 @@ src_configure() { multibuild_foreach_variant my_abi_configure } -abi_has_precision() { - #not all abi have all precisions - [[ -f ${BUILD_DIR}/Makefile ]] || return 0 - "$@" -} - src_compile() { - multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile + multibuild_foreach_variant autotools-multilib_src_compile } src_test () { @@ -156,7 +158,7 @@ src_test () { # Do not increase the number of threads, it will not help your performance #local testbase="perl check.pl --nthreads=1 --estimate" # ${testbase} -${p}d || die "Failure: $n" - multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck + multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck } src_install () { @@ -166,19 +168,13 @@ src_install () { #copied from autotools-multilib_secure_install my_abi_src_install() { - my_abi_secure_install() { - autotools-utils_src_install - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - multilib_check_headers - fi - } - - multilib_foreach_abi abi_has_precision my_abi_secure_install - #don't mix checksum of different precisions - rm -f "${T}"/.multilib_header_cksum + autotools-utils_src_install + if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then + multilib_prepare_wrappers + multilib_check_headers + fi } - multibuild_foreach_variant my_abi_src_install + multibuild_foreach_variant multilib_foreach_abi my_abi_src_install multilib_install_wrappers if use doc; then