| 1 |
commit: f0504839a891e2a6fa94dd3da3e520c8b9dc8cb3 |
| 2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Oct 27 12:16:22 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 27 18:34:11 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0504839 |
| 7 |
|
| 8 |
media-gfx/openvdb: replace -isystem with -I for GCC 6 compatibility |
| 9 |
|
| 10 |
Gentoo-bug: 597866 |
| 11 |
* Respect CXX |
| 12 |
* Respect ABI libdirs |
| 13 |
* Remove '-O3' from compile lines |
| 14 |
|
| 15 |
Signed-off by: Jonathan Scruggs (j.scruggs <AT> gmail.com) |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/2677 |
| 17 |
|
| 18 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 19 |
|
| 20 |
.../openvdb/files/openvdb-3.2.0-build-fixes.patch | 33 --- |
| 21 |
.../files/openvdb-3.2.0-fix-build-system.patch | 262 +++++++++++++++++++++ |
| 22 |
.../files/openvdb-3.2.0-makefile-fixes.patch | 93 -------- |
| 23 |
media-gfx/openvdb/openvdb-3.2.0.ebuild | 24 +- |
| 24 |
4 files changed, 276 insertions(+), 136 deletions(-) |
| 25 |
|
| 26 |
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch b/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index e919ec2..00000000 |
| 29 |
--- a/media-gfx/openvdb/files/openvdb-3.2.0-build-fixes.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,33 +0,0 @@ |
| 32 |
-diff -purN a/doxygen-config b/doxygen-config |
| 33 |
---- a/doxygen-config 2016-08-10 16:59:33.000000000 +0100 |
| 34 |
-+++ b/doxygen-config 2016-10-12 12:19:06.124785164 +0100 |
| 35 |
-@@ -2257,7 +2257,7 @@ DIRECTORY_GRAPH = YES |
| 36 |
- # The default value is: png. |
| 37 |
- # This tag requires that the tag HAVE_DOT is set to YES. |
| 38 |
- |
| 39 |
--DOT_IMAGE_FORMAT = png |
| 40 |
-+DOT_IMAGE_FORMAT = svg |
| 41 |
- |
| 42 |
- # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to |
| 43 |
- # enable generation of interactive SVG images that allow zooming and panning. |
| 44 |
-diff -purN a/Makefile b/Makefile |
| 45 |
---- a/Makefile 2016-08-10 16:59:33.000000000 +0100 |
| 46 |
-+++ b/Makefile 2016-10-12 12:18:32.434773635 +0100 |
| 47 |
-@@ -678,7 +678,7 @@ ALL_PRODUCTS := \ |
| 48 |
- @echo "Building $@ because of $(call list_deps)" |
| 49 |
- $(CXX) -c $(CXXFLAGS) -fPIC -o $@ $< |
| 50 |
- |
| 51 |
--all: lib python vdb_print vdb_render vdb_test depend |
| 52 |
-+all: lib python vdb_print vdb_render vdb_view vdb_test depend |
| 53 |
- |
| 54 |
- $(OBJ_NAMES): %.o: %.cc |
| 55 |
- @echo "Building $@ because of $(call list_deps)" |
| 56 |
-@@ -794,7 +794,7 @@ pydoc: $(PYTHON_MODULE) $(LIBOPENVDB_SON |
| 57 |
- echo "Created $${pydocdir}"; \ |
| 58 |
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \ |
| 59 |
- export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \ |
| 60 |
-- $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) |
| 61 |
-+ $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) |
| 62 |
- else |
| 63 |
- pydoc: |
| 64 |
- @echo "$@"': $$EPYDOC is undefined' |
| 65 |
|
| 66 |
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch |
| 67 |
new file mode 100644 |
| 68 |
index 00000000..66112af |
| 69 |
--- /dev/null |
| 70 |
+++ b/media-gfx/openvdb/files/openvdb-3.2.0-fix-build-system.patch |
| 71 |
@@ -0,0 +1,262 @@ |
| 72 |
+* Make build system honour the proper ABI library directory. |
| 73 |
+* Replace -isystem arguments with -I, as the former causes issues with GCC 6. |
| 74 |
+ See also: |
| 75 |
+ https://bugs.gentoo.org/show_bug.cgi?id=597866 |
| 76 |
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 |
| 77 |
+ |
| 78 |
+--- a/doxygen-config |
| 79 |
++++ b/doxygen-config |
| 80 |
+@@ -2257,7 +2257,7 @@ |
| 81 |
+ # The default value is: png. |
| 82 |
+ # This tag requires that the tag HAVE_DOT is set to YES. |
| 83 |
+ |
| 84 |
+-DOT_IMAGE_FORMAT = png |
| 85 |
++DOT_IMAGE_FORMAT = svg |
| 86 |
+ |
| 87 |
+ # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to |
| 88 |
+ # enable generation of interactive SVG images that allow zooming and panning. |
| 89 |
+--- a/Makefile |
| 90 |
++++ b/Makefile |
| 91 |
+@@ -82,6 +82,7 @@ |
| 92 |
+ |
| 93 |
+ # The directory into which to install libraries, executables and header files |
| 94 |
+ DESTDIR := /tmp/OpenVDB |
| 95 |
++libdir = lib |
| 96 |
+ |
| 97 |
+ # The parent directory of the boost/ header directory |
| 98 |
+ BOOST_INCL_DIR := $(HT)/include |
| 99 |
+@@ -158,6 +159,9 @@ |
| 100 |
+ # The directory containing libpython |
| 101 |
+ PYTHON_LIB_DIR := $(HFS)/python/lib |
| 102 |
+ PYTHON_LIB := -lpython$(PYTHON_VERSION) |
| 103 |
++# The Directory to install the python module and includes to. |
| 104 |
++PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION) |
| 105 |
++PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION) |
| 106 |
+ # The directory containing libboost_python |
| 107 |
+ BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib |
| 108 |
+ BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1 |
| 109 |
+@@ -179,7 +183,6 @@ |
| 110 |
+ # (leave blank if Doxygen is unavailable) |
| 111 |
+ DOXYGEN := doxygen |
| 112 |
+ |
| 113 |
+- |
| 114 |
+ # |
| 115 |
+ # Ideally, users shouldn't need to change anything below this line. |
| 116 |
+ # |
| 117 |
+@@ -207,11 +210,7 @@ |
| 118 |
+ endif |
| 119 |
+ endif |
| 120 |
+ |
| 121 |
+-ifeq (yes,$(strip $(debug))) |
| 122 |
+- OPTIMIZE := -g |
| 123 |
+-else |
| 124 |
+- OPTIMIZE := -O3 -DNDEBUG |
| 125 |
+-endif |
| 126 |
++OPTIMIZE := -DNDEBUG |
| 127 |
+ |
| 128 |
+ ifeq (yes,$(strip $(verbose))) |
| 129 |
+ QUIET := |
| 130 |
+@@ -242,12 +241,12 @@ |
| 131 |
+ has_python := yes |
| 132 |
+ endif |
| 133 |
+ |
| 134 |
+-INCLDIRS := -I . -I .. -isystem $(BOOST_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) -isystem $(TBB_INCL_DIR) |
| 135 |
++INCLDIRS := -I. -I.. -I$(BOOST_INCL_DIR) -I$(ILMBASE_INCL_DIR) -I$(TBB_INCL_DIR) |
| 136 |
+ ifeq (yes,$(has_blosc)) |
| 137 |
+- INCLDIRS += -isystem $(BLOSC_INCL_DIR) |
| 138 |
++ INCLDIRS += -I$(BLOSC_INCL_DIR) |
| 139 |
+ endif |
| 140 |
+ ifeq (yes,$(has_log4cplus)) |
| 141 |
+- INCLDIRS += -isystem $(LOG4CPLUS_INCL_DIR) |
| 142 |
++ INCLDIRS += -I$(LOG4CPLUS_INCL_DIR) |
| 143 |
+ endif |
| 144 |
+ |
| 145 |
+ CXXFLAGS += -std=c++0x |
| 146 |
+@@ -565,9 +564,9 @@ |
| 147 |
+ python/pyTransform.cc \ |
| 148 |
+ python/pyVec3Grid.cc \ |
| 149 |
+ # |
| 150 |
+-PYCXXFLAGS := -fPIC -isystem python -isystem $(PYTHON_INCL_DIR) -isystem $(PYCONFIG_INCL_DIR) |
| 151 |
++PYCXXFLAGS := -fPIC -Ipython -I$(PYTHON_INCL_DIR) -I$(PYCONFIG_INCL_DIR) |
| 152 |
+ ifneq (,$(strip $(NUMPY_INCL_DIR))) |
| 153 |
+-PYCXXFLAGS += -isystem $(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY |
| 154 |
++PYCXXFLAGS += -I$(NUMPY_INCL_DIR) -DPY_OPENVDB_USE_NUMPY |
| 155 |
+ endif |
| 156 |
+ ifneq (no,$(strip $(PYTHON_WRAP_ALL_GRID_TYPES))) |
| 157 |
+ PYCXXFLAGS += -DPY_OPENVDB_WRAP_ALL_GRID_TYPES |
| 158 |
+@@ -678,7 +677,7 @@ |
| 159 |
+ @echo "Building $@ because of $(call list_deps)" |
| 160 |
+ $(CXX) -c $(CXXFLAGS) -fPIC -o $@ $< |
| 161 |
+ |
| 162 |
+-all: lib python vdb_print vdb_render vdb_test depend |
| 163 |
++all: lib python vdb_print vdb_render vdb_view vdb_test depend |
| 164 |
+ |
| 165 |
+ $(OBJ_NAMES): %.o: %.cc |
| 166 |
+ @echo "Building $@ because of $(call list_deps)" |
| 167 |
+@@ -719,8 +718,13 @@ |
| 168 |
+ @echo "Generating documentation because of $(list_deps)" |
| 169 |
+ echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \ |
| 170 |
+ | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \ |
| 171 |
+- && cd ./doc/latex && make refman.pdf $(QUIET) \ |
| 172 |
++ && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \ |
| 173 |
+ && echo 'Created doc/latex/refman.pdf' |
| 174 |
++ @# |
| 175 |
++ mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \ |
| 176 |
++ echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \ |
| 177 |
++ cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \ |
| 178 |
++ echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \ |
| 179 |
+ |
| 180 |
+ ifneq (,$(strip $(DOXYGEN))) |
| 181 |
+ doc: $(DOC_INDEX) |
| 182 |
+@@ -734,14 +738,14 @@ |
| 183 |
+ |
| 184 |
+ vdb_print: $(LIBOPENVDB) cmd/openvdb_print/main.cc |
| 185 |
+ @echo "Building $@ because of $(list_deps)" |
| 186 |
+- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I . \ |
| 187 |
++ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_print/main.cc -I. \ |
| 188 |
+ $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ |
| 189 |
+ $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB) |
| 190 |
+ |
| 191 |
+ vdb_render: $(LIBOPENVDB) cmd/openvdb_render/main.cc |
| 192 |
+ @echo "Building $@ because of $(list_deps)" |
| 193 |
+- $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I . \ |
| 194 |
+- -isystem $(EXR_INCL_DIR) -isystem $(ILMBASE_INCL_DIR) \ |
| 195 |
++ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_render/main.cc -I. \ |
| 196 |
++ -I$(EXR_INCL_DIR) -I$(ILMBASE_INCL_DIR) \ |
| 197 |
+ -Wl,-rpath,$(EXR_LIB_DIR) -L$(EXR_LIB_DIR) $(EXR_LIB) \ |
| 198 |
+ -Wl,-rpath,$(ILMBASE_LIB_DIR) -L$(ILMBASE_LIB_DIR) $(ILMBASE_LIB) \ |
| 199 |
+ $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ |
| 200 |
+@@ -761,12 +765,12 @@ |
| 201 |
+ $(LIBVIEWER_OBJ_NAMES): $(LIBVIEWER_INCLUDE_NAMES) |
| 202 |
+ $(LIBVIEWER_OBJ_NAMES): %.o: %.cc |
| 203 |
+ @echo "Building $@ because of $(list_deps)" |
| 204 |
+- $(CXX) -c $(CXXFLAGS) -I . -isystem $(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $< |
| 205 |
++ $(CXX) -c $(CXXFLAGS) -I. -I$(GLFW_INCL_DIR) -DGL_GLEXT_PROTOTYPES=1 -fPIC -o $@ $< |
| 206 |
+ |
| 207 |
+ vdb_view: $(LIBOPENVDB) $(LIBVIEWER_OBJ_NAMES) cmd/openvdb_view/main.cc |
| 208 |
+ @echo "Building $@ because of $(list_deps)" |
| 209 |
+ $(CXX) $(CXXFLAGS) -o $@ cmd/openvdb_view/main.cc $(LIBVIEWER_OBJ_NAMES) \ |
| 210 |
+- -I . -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \ |
| 211 |
++ -I. -Wl,-rpath,$(GLFW_LIB_DIR) -L$(GLFW_LIB_DIR) $(GLFW_LIB) \ |
| 212 |
+ $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ |
| 213 |
+ $(LIBVIEWER_FLAGS) $(LIBS_RPATH) $(BOOST_THREAD_LIB) $(CONCURRENT_MALLOC_LIB) |
| 214 |
+ endif |
| 215 |
+@@ -776,7 +780,7 @@ |
| 216 |
+ $(PYTHON_OBJ_NAMES): $(PYTHON_INCLUDE_NAMES) |
| 217 |
+ $(PYTHON_OBJ_NAMES): %.o: %.cc |
| 218 |
+ @echo "Building $@ because of $(list_deps)" |
| 219 |
+- $(CXX) -c $(CXXFLAGS) -I . $(PYCXXFLAGS) -o $@ $< |
| 220 |
++ $(CXX) -c $(CXXFLAGS) -I. $(PYCXXFLAGS) -o $@ $< |
| 221 |
+ $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES) |
| 222 |
+ @echo "Building $@ because of $(list_deps)" |
| 223 |
+ $(CXX) $(CXXFLAGS) $(PYCXXFLAGS) -shared $(PYTHON_SONAME_FLAGS) -o $@ $(PYTHON_OBJ_NAMES) \ |
| 224 |
+@@ -784,6 +788,22 @@ |
| 225 |
+ -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \ |
| 226 |
+ $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ |
| 227 |
+ $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB) |
| 228 |
++ @echo "Installing the python module and includes" |
| 229 |
++ @# |
| 230 |
++ mkdir -p $(PYTHON_INSTALL_INCL_DIR); \ |
| 231 |
++ echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \ |
| 232 |
++ cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \ |
| 233 |
++ echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \ |
| 234 |
++ mkdir -p $(PYTHON_INSTALL_LIB_DIR); \ |
| 235 |
++ echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \ |
| 236 |
++ cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \ |
| 237 |
++ pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \ |
| 238 |
++ ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ |
| 239 |
++ popd > /dev/null; \ |
| 240 |
++ echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)" |
| 241 |
++ @echo "Clean the Python modules so the next one will compile" |
| 242 |
++ @# |
| 243 |
++ $(RM) $(PYTHON_OBJ_NAMES) |
| 244 |
+ |
| 245 |
+ ifeq (yes,$(has_python)) |
| 246 |
+ ifneq (,$(strip $(EPYDOC))) |
| 247 |
+@@ -794,7 +814,7 @@ |
| 248 |
+ echo "Created $${pydocdir}"; \ |
| 249 |
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(CURDIR); \ |
| 250 |
+ export PYTHONPATH=${PYTHONPATH}:$(CURDIR); \ |
| 251 |
+- $(EPYDOC) --html -o $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) |
| 252 |
++ $(EPYDOC) --html --html-dir $${pydocdir} $(PYTHON_MODULE_NAME) $(QUIET) |
| 253 |
+ else |
| 254 |
+ pydoc: |
| 255 |
+ @echo "$@"': $$EPYDOC is undefined' |
| 256 |
+@@ -815,7 +835,7 @@ |
| 257 |
+ |
| 258 |
+ $(UNITTEST_OBJ_NAMES): %.o: %.cc |
| 259 |
+ @echo "Building $@ because of $(list_deps)" |
| 260 |
+- $(CXX) -c $(CXXFLAGS) -isystem $(CPPUNIT_INCL_DIR) -fPIC -o $@ $< |
| 261 |
++ $(CXX) -c $(CXXFLAGS) -I$(CPPUNIT_INCL_DIR) -fPIC -o $@ $< |
| 262 |
+ |
| 263 |
+ ifneq (,$(strip $(CPPUNIT_INCL_DIR))) |
| 264 |
+ vdb_test: $(LIBOPENVDB) $(UNITTEST_OBJ_NAMES) |
| 265 |
+@@ -835,7 +855,7 @@ |
| 266 |
+ @echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined' |
| 267 |
+ endif |
| 268 |
+ |
| 269 |
+-install: lib python vdb_print vdb_render vdb_view doc pydoc |
| 270 |
++install: lib vdb_print vdb_render vdb_view doc pydoc |
| 271 |
+ mkdir -p $(DESTDIR)/include/openvdb |
| 272 |
+ @echo "Created $(DESTDIR)/include/openvdb" |
| 273 |
+ pushd $(DESTDIR)/include/openvdb > /dev/null; \ |
| 274 |
+@@ -851,42 +871,25 @@ |
| 275 |
+ fi |
| 276 |
+ @echo "Copied header files to $(DESTDIR)/include" |
| 277 |
+ @# |
| 278 |
+- mkdir -p $(DESTDIR)/lib |
| 279 |
+- @echo "Created $(DESTDIR)/lib/" |
| 280 |
+- cp -f $(LIBOPENVDB) $(DESTDIR)/lib |
| 281 |
+- pushd $(DESTDIR)/lib > /dev/null; \ |
| 282 |
++ mkdir -p $(DESTDIR)/$(libdir) |
| 283 |
++ @echo "Created $(DESTDIR)/$(libdir)/" |
| 284 |
++ cp -f $(LIBOPENVDB) $(DESTDIR)/$(libdir) |
| 285 |
++ pushd $(DESTDIR)/$(libdir) > /dev/null; \ |
| 286 |
+ if [ -f $(LIBOPENVDB_SHARED) ]; then \ |
| 287 |
+ ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SHARED_NAME); \ |
| 288 |
+ ln -f -s $(LIBOPENVDB_SHARED) $(LIBOPENVDB_SONAME); \ |
| 289 |
+ fi; \ |
| 290 |
+ popd > /dev/null |
| 291 |
+- @echo "Copied libopenvdb to $(DESTDIR)/lib/" |
| 292 |
++ @echo "Copied libopenvdb to $(DESTDIR)/$(libdir)/" |
| 293 |
+ @# |
| 294 |
+ if [ -f $(LIBVIEWER) ]; \ |
| 295 |
+ then \ |
| 296 |
+- cp -f $(LIBVIEWER) $(DESTDIR)/lib; \ |
| 297 |
+- pushd $(DESTDIR)/lib > /dev/null; \ |
| 298 |
++ cp -f $(LIBVIEWER) $(DESTDIR)/$(libdir); \ |
| 299 |
++ pushd $(DESTDIR)/$(libdir) > /dev/null; \ |
| 300 |
+ if [ -f $(LIBVIEWER_SHARED) ]; then \ |
| 301 |
+ ln -f -s $(LIBVIEWER_SHARED) $(LIBVIEWER_SHARED_NAME); fi; \ |
| 302 |
+ popd > /dev/null; \ |
| 303 |
+- echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \ |
| 304 |
+- fi |
| 305 |
+- @# |
| 306 |
+- if [ -f $(PYTHON_MODULE) ]; \ |
| 307 |
+- then \ |
| 308 |
+- installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \ |
| 309 |
+- mkdir -p $${installdir}; \ |
| 310 |
+- echo "Created $${installdir}"; \ |
| 311 |
+- cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \ |
| 312 |
+- echo "Copied Python header files to $${installdir}"; \ |
| 313 |
+- installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \ |
| 314 |
+- mkdir -p $${installdir}; \ |
| 315 |
+- echo "Created $${installdir}"; \ |
| 316 |
+- cp -f $(PYTHON_MODULE) $${installdir}/; \ |
| 317 |
+- pushd $${installdir} > /dev/null; \ |
| 318 |
+- ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ |
| 319 |
+- popd > /dev/null; \ |
| 320 |
+- echo "Copied Python module to $${installdir}"; \ |
| 321 |
++ echo "Copied libopenvdb_viewer to $(DESTDIR)/$(libdir)/"; \ |
| 322 |
+ fi |
| 323 |
+ @# |
| 324 |
+ mkdir -p $(DESTDIR)/bin |
| 325 |
+@@ -924,7 +927,7 @@ |
| 326 |
+ for f in $(UNITTEST_SRC_NAMES); \ |
| 327 |
+ do $(CXX) $(CXXFLAGS) -O0 \ |
| 328 |
+ -MM $$f -MT `echo $$f | sed 's%\.[^.]*%.o%'` \ |
| 329 |
+- -isystem $(CPPUNIT_INCL_DIR) >> $(DEPEND); \ |
| 330 |
++ -I$(CPPUNIT_INCL_DIR) >> $(DEPEND); \ |
| 331 |
+ done; \ |
| 332 |
+ fi |
| 333 |
+ |
| 334 |
|
| 335 |
diff --git a/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch b/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch |
| 336 |
deleted file mode 100644 |
| 337 |
index 633c380..00000000 |
| 338 |
--- a/media-gfx/openvdb/files/openvdb-3.2.0-makefile-fixes.patch |
| 339 |
+++ /dev/null |
| 340 |
@@ -1,93 +0,0 @@ |
| 341 |
-diff --git a/Makefile b/Makefile |
| 342 |
-index fba4fb6..0054f64 100644 |
| 343 |
---- a/Makefile |
| 344 |
-+++ b/Makefile |
| 345 |
-@@ -158,6 +158,9 @@ PYCONFIG_INCL_DIR := $(PYTHON_INCL_DIR) |
| 346 |
- # The directory containing libpython |
| 347 |
- PYTHON_LIB_DIR := $(HFS)/python/lib |
| 348 |
- PYTHON_LIB := -lpython$(PYTHON_VERSION) |
| 349 |
-+# The Directory to install the python module and includes to. |
| 350 |
-+PYTHON_INSTALL_INCL_DIR := $(DESTDIR)/python/include/python$(PYTHON_VERSION) |
| 351 |
-+PYTHON_INSTALL_LIB_DIR := $(DESTDIR)/python/lib/python$(PYTHON_VERSION) |
| 352 |
- # The directory containing libboost_python |
| 353 |
- BOOST_PYTHON_LIB_DIR := /rel/depot/third_party_build/boost/rhel6-1.46.1-0/lib |
| 354 |
- BOOST_PYTHON_LIB := -lboost_python-gcc41-mt-python26-1_46_1 |
| 355 |
-@@ -179,7 +182,6 @@ PYTHON_WRAP_ALL_GRID_TYPES := no |
| 356 |
- # (leave blank if Doxygen is unavailable) |
| 357 |
- DOXYGEN := doxygen |
| 358 |
- |
| 359 |
-- |
| 360 |
- # |
| 361 |
- # Ideally, users shouldn't need to change anything below this line. |
| 362 |
- # |
| 363 |
-@@ -717,8 +719,13 @@ $(DOC_PDF): doxygen-config $(INCLUDE_NAMES) $(SRC_NAMES) $(DOC_FILES) |
| 364 |
- @echo "Generating documentation because of $(list_deps)" |
| 365 |
- echo -e 'OUTPUT_DIRECTORY=./doc\nGENERATE_LATEX=YES\nGENERATE_HTML=NO' \ |
| 366 |
- | cat doxygen-config - | $(DOXYGEN) - $(QUIET) \ |
| 367 |
-- && cd ./doc/latex && make refman.pdf $(QUIET) \ |
| 368 |
-+ && cd ./doc/latex && $(MAKE) refman.pdf $(QUIET) \ |
| 369 |
- && echo 'Created doc/latex/refman.pdf' |
| 370 |
-+ @# |
| 371 |
-+ mkdir -p $(DESTDIR)/share/doc/openvdb/pdf; \ |
| 372 |
-+ echo "Created $(DESTDIR)/share/doc/openvdb/pdf"; \ |
| 373 |
-+ cp -r -f doc/latex/refman.pdf $(DESTDIR)/share/doc/openvdb/pdf/; \ |
| 374 |
-+ echo "Copied documentation to $(DESTDIR)/share/doc/openvdb/pdf/"; \ |
| 375 |
- |
| 376 |
- ifneq (,$(strip $(DOXYGEN))) |
| 377 |
- doc: $(DOC_INDEX) |
| 378 |
-@@ -782,6 +789,22 @@ $(PYTHON_MODULE): $(LIBOPENVDB) $(PYTHON_OBJ_NAMES) |
| 379 |
- -Wl,-rpath,$(BOOST_PYTHON_LIB_DIR) -L$(BOOST_PYTHON_LIB_DIR) $(BOOST_PYTHON_LIB) \ |
| 380 |
- $(LIBOPENVDB_RPATH) -L$(CURDIR) $(LIBOPENVDB) \ |
| 381 |
- $(LIBS_RPATH) $(CONCURRENT_MALLOC_LIB) |
| 382 |
-+ @echo "Installing the python module and includes" |
| 383 |
-+ @# |
| 384 |
-+ mkdir -p $(PYTHON_INSTALL_INCL_DIR); \ |
| 385 |
-+ echo "Created $(PYTHON_INSTALL_INCL_DIR)"; \ |
| 386 |
-+ cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $(PYTHON_INSTALL_INCL_DIR)/; \ |
| 387 |
-+ echo "Copied Python header files to $(PYTHON_INSTALL_INCL_DIR)"; \ |
| 388 |
-+ mkdir -p $(PYTHON_INSTALL_LIB_DIR); \ |
| 389 |
-+ echo "Created $(PYTHON_INSTALL_LIB_DIR)"; \ |
| 390 |
-+ cp -f $(PYTHON_MODULE) $(PYTHON_INSTALL_LIB_DIR)/; \ |
| 391 |
-+ pushd $(PYTHON_INSTALL_LIB_DIR) > /dev/null; \ |
| 392 |
-+ ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ |
| 393 |
-+ popd > /dev/null; \ |
| 394 |
-+ echo "Copied Python module to $(PYTHON_INSTALL_LIB_DIR)" |
| 395 |
-+ @echo "Clean the Python modules so the next one will compile" |
| 396 |
-+ @# |
| 397 |
-+ $(RM) $(PYTHON_OBJ_NAMES) |
| 398 |
- |
| 399 |
- ifeq (yes,$(has_python)) |
| 400 |
- ifneq (,$(strip $(EPYDOC))) |
| 401 |
-@@ -833,7 +856,7 @@ test: |
| 402 |
- @echo "$@"': $$(CPPUNIT_INCL_DIR) is undefined' |
| 403 |
- endif |
| 404 |
- |
| 405 |
--install: lib python vdb_print vdb_render vdb_view doc pydoc |
| 406 |
-+install: lib vdb_print vdb_render vdb_view doc pydoc |
| 407 |
- mkdir -p $(DESTDIR)/include/openvdb |
| 408 |
- @echo "Created $(DESTDIR)/include/openvdb" |
| 409 |
- pushd $(DESTDIR)/include/openvdb > /dev/null; \ |
| 410 |
-@@ -870,23 +893,6 @@ install: lib python vdb_print vdb_render vdb_view doc pydoc |
| 411 |
- echo "Copied libopenvdb_viewer to $(DESTDIR)/lib/"; \ |
| 412 |
- fi |
| 413 |
- @# |
| 414 |
-- if [ -f $(PYTHON_MODULE) ]; \ |
| 415 |
-- then \ |
| 416 |
-- installdir=$(DESTDIR)/python/include/python$(PYTHON_VERSION); \ |
| 417 |
-- mkdir -p $${installdir}; \ |
| 418 |
-- echo "Created $${installdir}"; \ |
| 419 |
-- cp -f $(PYTHON_PUBLIC_INCLUDE_NAMES) $${installdir}/; \ |
| 420 |
-- echo "Copied Python header files to $${installdir}"; \ |
| 421 |
-- installdir=$(DESTDIR)/python/lib/python$(PYTHON_VERSION); \ |
| 422 |
-- mkdir -p $${installdir}; \ |
| 423 |
-- echo "Created $${installdir}"; \ |
| 424 |
-- cp -f $(PYTHON_MODULE) $${installdir}/; \ |
| 425 |
-- pushd $${installdir} > /dev/null; \ |
| 426 |
-- ln -f -s $(PYTHON_MODULE) $(PYTHON_SONAME); \ |
| 427 |
-- popd > /dev/null; \ |
| 428 |
-- echo "Copied Python module to $${installdir}"; \ |
| 429 |
-- fi |
| 430 |
-- @# |
| 431 |
- mkdir -p $(DESTDIR)/bin |
| 432 |
- @echo "Created $(DESTDIR)/bin/" |
| 433 |
- cp -f vdb_print $(DESTDIR)/bin |
| 434 |
|
| 435 |
diff --git a/media-gfx/openvdb/openvdb-3.2.0.ebuild b/media-gfx/openvdb/openvdb-3.2.0.ebuild |
| 436 |
index 649cd99..ed84fad 100644 |
| 437 |
--- a/media-gfx/openvdb/openvdb-3.2.0.ebuild |
| 438 |
+++ b/media-gfx/openvdb/openvdb-3.2.0.ebuild |
| 439 |
@@ -2,10 +2,11 @@ |
| 440 |
# Distributed under the terms of the GNU General Public License v2 |
| 441 |
# $id$ |
| 442 |
|
| 443 |
-EAPI="6" |
| 444 |
+EAPI=6 |
| 445 |
+ |
| 446 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 447 |
|
| 448 |
-inherit eutils python-r1 |
| 449 |
+inherit eutils python-r1 toolchain-funcs |
| 450 |
|
| 451 |
DESCRIPTION="Libs for the efficient manipulation of volumetric data" |
| 452 |
HOMEPAGE="http://www.openvdb.org" |
| 453 |
@@ -43,9 +44,10 @@ DEPEND="${RDEPEND} |
| 454 |
|
| 455 |
S="${WORKDIR}/${P}/${PN}" |
| 456 |
|
| 457 |
-PATCHES=( "${FILESDIR}"/${P}-numpy-fix.patch |
| 458 |
- "${FILESDIR}"/${P}-makefile-fixes.patch |
| 459 |
- "${FILESDIR}"/${P}-build-fixes.patch ) |
| 460 |
+PATCHES=( |
| 461 |
+ "${FILESDIR}"/${P}-numpy-fix.patch |
| 462 |
+ "${FILESDIR}"/${P}-fix-build-system.patch |
| 463 |
+) |
| 464 |
|
| 465 |
python_module_compile() { |
| 466 |
mypythonargs=( |
| 467 |
@@ -54,15 +56,15 @@ python_module_compile() { |
| 468 |
PYCONFIG_INCL_DIR="$(python_get_includedir)" |
| 469 |
PYTHON_LIB_DIR="$(python_get_library_path)" |
| 470 |
PYTHON_LIB="$(python_get_LIBS)" |
| 471 |
- PYTHON_INSTALL_INCL_DIR="${D}$(python_get_includedir)" |
| 472 |
- PYTHON_INSTALL_LIB_DIR="${D}$(python_get_sitedir)" |
| 473 |
+ PYTHON_INSTALL_INCL_DIR="${D%/}$(python_get_includedir)" |
| 474 |
+ PYTHON_INSTALL_LIB_DIR="${D%/}$(python_get_sitedir)" |
| 475 |
NUMPY_INCL_DIR="$(python_get_sitedir)"/numpy/core/include/numpy |
| 476 |
BOOST_PYTHON_LIB_DIR="${myprefixlibdir}" |
| 477 |
BOOST_PYTHON_LIB=-lboost_python-${EPYTHON/python/} |
| 478 |
) |
| 479 |
|
| 480 |
einfo "Compiling module for ${EPYTHON}." |
| 481 |
- emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" |
| 482 |
+ emake python "${myemakeargs[@]}" "${mypythonargs[@]}" EPYDOC="" CXX="$(tc-getCXX)" |
| 483 |
|
| 484 |
# This is so the correct version of pdoc is used |
| 485 |
mypyscriptdir=$(python_get_scriptdir) |
| 486 |
@@ -84,7 +86,9 @@ src_install() { |
| 487 |
# So individule targets can be called without duplication |
| 488 |
# Common depends: |
| 489 |
local myemakeargs=( |
| 490 |
- rpath=no shared=yes |
| 491 |
+ rpath=no |
| 492 |
+ shared=yes |
| 493 |
+ libdir="$(get_libdir)" |
| 494 |
LIBOPENVDB_RPATH= |
| 495 |
DESTDIR="${D}" |
| 496 |
HFS="${myprefix}" |
| 497 |
@@ -154,5 +158,5 @@ src_install() { |
| 498 |
fi |
| 499 |
|
| 500 |
einfo "Compiling the main components." |
| 501 |
- emake install "${myemakeargs[@]}" "${mypythonargs[@]}" |
| 502 |
+ emake install "${myemakeargs[@]}" "${mypythonargs[@]}" CXX="$(tc-getCXX)" |
| 503 |
} |
Archives