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 548781381F3 for ; Wed, 11 Sep 2013 17:27:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EA5FE0BC3; Wed, 11 Sep 2013 17:27:13 +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 8E0DCE0BC3 for ; Wed, 11 Sep 2013 17:27:12 +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 5F31E33EBE5 for ; Wed, 11 Sep 2013 17:27:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9B8CCE5458 for ; Wed, 11 Sep 2013 17:27:09 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1371253529.e97c7b867b58ab2e683b80b21c664182cece2e96.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/itk/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/itk/itk-4.4.0.ebuild X-VCS-Directories: sci-libs/itk/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: e97c7b867b58ab2e683b80b21c664182cece2e96 X-VCS-Branch: master Date: Wed, 11 Sep 2013 17:27:09 +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: 1885c7a0-6faf-40e2-b88e-169c1a8f6033 X-Archives-Hash: ad9e2ecdb742946772a8760b124d9f01 commit: e97c7b867b58ab2e683b80b21c664182cece2e96 Author: Gert Wollny gmail com> AuthorDate: Fri Jun 14 23:45:29 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Fri Jun 14 23:45:29 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e97c7b86 update the dependencies and handling of missing varibles After some more inspection of the build system it turns out that now hdf5 is always required, so I removed the useflag and made the dependency obligarory. In addition, I changed the handling when the environment variables are not set i.e. only if python bindings are requested and only for the *DIMS variable the ebuold will bail out, for the memory size the default fallback "1" will be used if it is not set. I also added the sse2 use flag since VNL can profit from it. --- sci-libs/itk/itk-4.4.0.ebuild | 58 +++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/sci-libs/itk/itk-4.4.0.ebuild b/sci-libs/itk/itk-4.4.0.ebuild index e0e87e2..3544e4e 100644 --- a/sci-libs/itk/itk-4.4.0.ebuild +++ b/sci-libs/itk/itk-4.4.0.ebuild @@ -16,15 +16,15 @@ RESTRICT="primaryuri" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="debug examples fftw hdf5 itkv3compat python review test" +IUSE="debug examples fftw itkv3compat python review sse2 test" RDEPEND="fftw? ( sci-libs/fftw:3.0 ) - hdf5? ( sci-libs/hdf5[cxx] ) - virtual/jpeg - media-libs/libpng - media-libs/tiff:0 - sys-libs/zlib - " + sci-libs/hdf5[cxx] + virtual/jpeg + media-libs/libpng + media-libs/tiff:0 + sys-libs/zlib + " DEPEND="${RDEPEND} >=dev-util/cmake-2.8 python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0 >=dev-cpp/gccxml-0.9.0_pre20120309 ) @@ -38,32 +38,34 @@ PATCHES=( ) pkg_pretend() { - bailout=no + missing_memsize="no" if [ "x$ITK_COMPUTER_MEMORY_SIZE" = "x" ]; then - elog "To tune ITK to make the best use ouf working memory you must set" + elog "To tune ITK to make the best use ouf working memory you should set" elog "ITK_COMPUTER_MEMORY_SIZE in /etc/make.conf to the size of the " elog "memory installed in your machine. For example for 4GB you do:" elog "" elog " echo 'ITK_COMPUTER_MEMORY_SIZE=4' >> /etc/make.conf" - elog "" - bailout=yes + elog "---" + missing_memsize="ITK_COMPUTER_MEMORY_SIZE and" fi if use python ; then + if [ "x$ITK_WRAP_DIMS" = "x" ]; then - elog "For Python language bindings it is necessary to " - elog "define the dimensions you want to create bindings for" - elog "by setting in ITK_WRAP_DIMS in /etc/make.conf." - elog "For example, to provide bindings for 2D and 3D data do:" - elog "" - elog " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf" - elog "" - bailout=yes + eerror "For Python language bindings it is necessary to " + eerror "define the dimensions you want to create bindings for" + eerror "by setting in ITK_WRAP_DIMS in /etc/make.conf." + eerror "For example, to provide bindings for 2D and 3D data do:" + eerror "" + eerror " echo 'ITK_WRAP_DIMS=2;3' >> /etc/make.conf" + eerror "" + # Compiling with python support takes very long, therefore it is better + # to bailout here if one or both of above variables are not set, and ask + # the user to provide the values. + die "Missing value for ITK_WRAP_DIMS" + fi fi - if [ "x$bailout" = "xyes" ]; then - die "Please add the missing variables to /etc/make.conf and then restart emerge" - fi } src_configure() { @@ -80,14 +82,22 @@ src_configure() { -DITK_USE_SYSTEM_GCCXML=ON -DITK_USE_SYSTEM_SWIG=ON -DBUILD_SHARED_LIBS=ON - -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE" + -DITK_USE_SYSTEM_HDF5=ON $(cmake-utils_use_build examples) $(cmake-utils_use_build test TESTING) - $(cmake-utils_use hdf5 ITK_USE_SYSTEM_HDF5) $(cmake-utils_use review ITK_USE_REVIEW) $(cmake-utils_use itkv3compat ITKV3_COMPATIBILITY) + $(cmake-utils_use sse2 VNL_CONFIG_ENABLE_SSE2) ) + # if this is not set, it defaults to 1GB, should be okay for most people. + # + if [ "x$ITK_COMPUTER_MEMORY_SIZE" != "x" ]; then + mycmakeargs+=( + -DITK_COMPUTER_MEMORY_SIZE="$ITK_COMPUTER_MEMORY_SIZE" + ) + fi + if use fftw; then mycmakeargs+=( -DUSE_FFTWD=ON