diff options
| author |   Jonathan Scruggs <j.scruggs@gmail.com> | 2016-10-27 13:16:22 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-10-27 20:34:11 +0200 |
| commit | f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3 (patch) | |
| tree | cc7041ccea63664e204f6404d2e57a146937cf28 /media-gfx/openvdb/openvdb-3.2.0.ebuild | |
| parent | app-crypt/gnupg: Add use flag system-cert-store (diff) | |
| download | gentoo-f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3.tar.gz gentoo-f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3.tar.bz2 gentoo-f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3.zip | |
media-gfx/openvdb: replace -isystem with -I for GCC 6 compatibility
Gentoo-bug: 597866
* Respect CXX
* Respect ABI libdirs
* Remove '-O3' from compile lines
Signed-off by: Jonathan Scruggs (j.scruggs@gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/2677
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-gfx/openvdb/openvdb-3.2.0.ebuild')
| -rw-r--r-- | media-gfx/openvdb/openvdb-3.2.0.ebuild | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild index 649cd999c792..ed84fad7f99d 100644 --- a/media-gfx/openvdb/openvdb-3.2.0.ebuild +++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild @@ -2,10 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $id$ -EAPI="6" +EAPI=6 + PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit eutils python-r1 +inherit eutils python-r1 toolchain-funcs DESCRIPTION="Libs for the efficient manipulation of volumetric data" HOMEPAGE="http://www.openvdb.org" @@ -43,9 +44,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P}/${PN}" -PATCHES=( "${FILESDIR}"/${P}-numpy-fix.patch - "${FILESDIR}"/${P}-makefile-fixes.patch - "${FILESDIR}"/${P}-build-fixes.patch ) +PATCHES=( + "${FILESDIR}"/${P}-numpy-fix.patch + "${FILESDIR}"/${P}-fix-build-system.patch +) python_module_compile() { mypythonargs=( @@ -54,15 +56,15 @@ python_module_compile() { PYCONFIG_INCL_DIR="$(python_get_includedir)" PYTHON_LIB_DIR="$(python_get_library_path)" PYTHON_LIB="$(python_get_LIBS)" - PYTHON_INSTALL_INCL_DIR="${D}$(python_get_includedir)" - PYTHON_INSTALL_LIB_DIR="${D}$(python_get_sitedir)" + PYTHON_INSTALL_INCL_DIR="${D%/}$(python_get_includedir)" + PYTHON_INSTALL_LIB_DIR="${D%/}$(python_get_sitedir)" NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy BOOST_PYTHON_LIB_DIR="${myprefixlibdir}" BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/} ) einfo "Compiling module for ${EPYTHON}." - emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" + emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)" # This is so the correct version of pdoc is used mypyscriptdir=$(python_get_scriptdir) @@ -84,7 +86,9 @@ src_install() { # So individule targets can be called without duplication # Common depends: local myemakeargs=( - rpath=no shared=yes + rpath=no + shared=yes + libdir="$(get_libdir)" LIBOPENVDB_RPATH= DESTDIR="${D}" HFS="${myprefix}" @@ -154,5 +158,5 @@ src_install() { fi einfo "Compiling the main components." - emake install "${myemakeargs[@]}" "${mypythonargs[@]}" + emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)" } |