[gentoo-commits] proj/sci:master commit in: sci-libs/itk/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Nicolas Bock" <nicolasbock@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/itk/
Date: Wed, 11 Sep 2013 17:27:09 +0000 (UTC)	[thread overview]
Message-ID: <1371253529.e97c7b867b58ab2e683b80b21c664182cece2e96.nicolasbock@gentoo> (raw)

commit:     e97c7b867b58ab2e683b80b21c664182cece2e96
Author:     Gert Wollny <gw.fossdev <AT> gmail <DOT> com>
AuthorDate: Fri Jun 14 23:45:29 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> 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

next             reply	other threads:[~2013-09-11 17:27 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-11 17:27 Nicolas Bock [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-22 11:58 [gentoo-commits] proj/sci:master commit in: sci-libs/itk/ Horea Christian
2023-04-25 15:33 Horea Christian
2023-04-25 15:33 Horea Christian
2023-04-20  3:13 Horea Christian
2023-04-20  3:13 Horea Christian
2023-04-03  2:58 Horea Christian
2022-09-15 11:17 Andrew Ammerlaan
2022-07-12 13:36 Horea Christian
2021-12-16 10:57 Andrew Ammerlaan
2021-03-13 23:55 Horea Christian
2021-03-13 23:55 Horea Christian
2021-03-04 20:57 Andrew Ammerlaan
2021-03-04 20:56 Andrew Ammerlaan
2021-01-19 16:56 Andrew Ammerlaan
2020-12-31 15:58 Aisha Tammy
2020-12-24 17:26 Horea Christian
2020-12-24 11:06 Horea Christian
2020-10-14  6:52 Horea Christian
2020-10-09 10:04 Horea Christian
2019-04-02  1:20 Horea Christian
2017-06-23  9:11 Justin Lecher
2015-09-21 17:44 Justin Lecher
2015-02-02 12:06 Justin Lecher
2014-01-06 19:58 Justin Lecher
2013-11-16 17:03 Guillaume Horel
2013-11-16 17:03 Guillaume Horel
2013-11-16 17:03 Guillaume Horel
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock
2013-09-11 17:27 Nicolas Bock

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e0e87e2 dfblob:3544e4e )
 OR (
bs:"[gentoo-commits] proj/sci:master commit in: sci-libs/itk/" )
	(help)

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=1371253529.e97c7b867b58ab2e683b80b21c664182cece2e96.nicolasbock@gentoo \
    --to=nicolasbock@gmail.com \
    --cc=gentoo-commits@lists.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