public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Christoph Junghans <ottxor@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH 8/8] fftw: example use of multibuild in ebuild.
Date: Sat, 2 Mar 2013 16:19:19 -0700	[thread overview]
Message-ID: <CANgp9ky2O4VPkugfmMd_gghqyyqQK_P+yqoYORe2BnUyVSTVvg@mail.gmail.com> (raw)
In-Reply-To: <1362001405-25636-8-git-send-email-mgorny@gentoo.org>

+1, feel free to commit, when multibuild.eclass was added.

2013/2/27 Michał Górny <mgorny@gentoo.org>:
> Just a quick, dirty example. Not even tested thoroughly ;).
> ---
>  gx86/sci-libs/fftw/fftw-3.3.3-r1.ebuild | 38 +++++++++++++--------------------
>  1 file changed, 15 insertions(+), 23 deletions(-)
>
> diff --git a/gx86/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/gx86/sci-libs/fftw/fftw-3.3.3-r1.ebuild
> index 18554f0..ddca8e4 100644
> --- a/gx86/sci-libs/fftw/fftw-3.3.3-r1.ebuild
> +++ b/gx86/sci-libs/fftw/fftw-3.3.3-r1.ebuild
> @@ -7,7 +7,7 @@ EAPI=5
>  #AUTOTOOLS_AUTORECONF=1
>  FORTRAN_NEEDED=fortran
>
> -inherit autotools-multilib eutils flag-o-matic fortran-2 toolchain-funcs versionator
> +inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
>
>  DESCRIPTION="Fast C library for the Discrete Fourier Transform"
>  HOMEPAGE="http://www.fftw.org/"
> @@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
>         test? ( dev-lang/perl )"
>
>  pkg_setup() {
> +       # XXX: this looks like it should be used with BUILD_TYPE!=binary
> +
>         if use openmp; then
>                 if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
>                         ewarn "OpenMP is not available in your current selected gcc"
> @@ -32,13 +34,13 @@ pkg_setup() {
>                 FORTRAN_NEED_OPENMP=1
>         fi
>         fortran-2_pkg_setup
> -       FFTW_DIRS="single double longdouble"
> +       MULTIBUILD_VARIANTS=( single double longdouble )
>         if use quad; then
>                 if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
>                         ewarn "quad precision only available for gcc >= 4.6"
>                         die "need quad precision capable gcc"
>                 fi
> -               FFTW_DIRS+=" quad"
> +               MULTIBUILD_VARIANTS+=( quad )
>         fi
>  }
>
> @@ -57,7 +59,9 @@ src_configure() {
>         # filter -Os according to docs
>         replace-flags -Os -O2
>
> -       for x in ${FFTW_DIRS}; do
> +       my_configure() {
> +               local x=${MULTIBUILD_VARIANT}
> +
>                 myeconfargs=(
>                         $(use_enable fma)
>                         $(use_enable fortran)
> @@ -93,42 +97,30 @@ src_configure() {
>                         die "${x} precision not implemented in this ebuild"
>                 fi
>
> -               einfo "Configuring for ${x} precision"
> -               BUILD_DIR="${S}-${x}" \
> -                       autotools-multilib_src_configure
> -       done
> +               autotools-multilib_src_configure
> +       }
> +
> +       multibuild_foreach my_configure
>  }
>
>  src_compile() {
> -       for x in ${FFTW_DIRS}; do
> -               einfo "Compiling for ${x} precision"
> -               BUILD_DIR="${S}-${x}" \
> -                       autotools-multilib_src_compile
> -       done
> +       multibuild_foreach autotools-multilib_src_compile
>  }
>
>  src_test () {
> -       do_smalltest() { cd "${BUILD_DIR}" && emake -C tests smallcheck; }
>         # We want this to be a reasonably quick test, but that is still hard...
>         ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
>         # 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"
> -       for x in ${FFTW_DIRS}; do
> -               einfo "Testing ${x} precision"
> -               BUILD_DIR="${S}-${x}" \
> -                       multilib_foreach_abi do_smalltest
> -       done
> +       multibuild_foreach autotools-multilib_src_compile -C tests smallcheck
>  }
>
>  src_install () {
>         local u x
>         DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
>         HTML_DOCS=( doc/html/ )
> -       for x in ${FFTW_DIRS}; do
> -               BUILD_DIR="${S}-${x}" \
> -                       autotools-multilib_src_install
> -       done
> +       multibuild_foreach autotools-multilib_src_install
>
>         if use doc; then
>                 dodoc doc/*.pdf
> --
> 1.8.1.4
>
>



--
Christoph Junghans
http://dev.gentoo.org/~ottxor/


  reply	other threads:[~2013-03-02 23:19 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-27 21:41 [gentoo-dev] [RFC] multibuild.eclass -- a generic pluggable framework to handle multi-variant builds Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 1/8] Initial version of multibuild eclass Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 2/8] Use bash redirection to run 'tee' rather than simple pipes Michał Górny
2013-02-28 13:09   ` Alec Warner
2013-02-28 14:53     ` Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 3/8] Avoid writing outside WORKDIR if S=${WORKDIR} Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 4/8] Convert multilib-build to use multibuild Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 5/8] python-r1: calculate final list of enabled impls for foreach Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 6/8] Convert python-r1 to use multibuild Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 7/8] Move run_in_build_dir() to multibuild.eclass Michał Górny
2013-02-27 21:43 ` [gentoo-dev] [PATCH 8/8] fftw: example use of multibuild in ebuild Michał Górny
2013-03-02 23:19   ` Christoph Junghans [this message]
2013-03-02 21:42 ` [gentoo-dev] Further changes to multibuild.eclass Michał Górny
2013-03-02 21:42   ` [gentoo-dev] [PATCH 1/4] multibuild: print only 'public' part of command-line Michał Górny
2013-03-02 22:52     ` Alec Warner
2013-03-02 23:03       ` Michał Górny
2013-03-02 21:42   ` [gentoo-dev] [PATCH 2/4] multibuild: add multibuild_for_best_variant() Michał Górny
2013-03-02 21:42   ` [gentoo-dev] [PATCH 3/4] multilib-build: introduce multilib_for_best_abi() Michał Górny
2013-03-02 21:42   ` [gentoo-dev] [PATCH 4/4] distutils-r1: reuse multibuild_for_best_variant Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CANgp9ky2O4VPkugfmMd_gghqyyqQK_P+yqoYORe2BnUyVSTVvg@mail.gmail.com \
    --to=ottxor@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox