#8 [Untested] Use c++14 for properly building with the latest version of openvdb
Merged a year ago by luya. Opened a year ago by cstratak.
rpms/ cstratak/blender master  into  master

file modified
+9 -3
@@ -28,7 +28,7 @@ 

  Name:       blender

  Epoch:      1

  Version:    %{blender_api}.5

- Release:    2%{?dist}

+ Release:    3%{?dist}

  

  Summary:    3D modeling, animation, rendering and post-production

  License:    GPLv2
@@ -45,9 +45,7 @@ 

  

  # Upstream fix to support Python 3.9

  # https://developer.blender.org/rB56d0df51a36fdce7ec2d1fbb7b47b1d95b591b5f

- %if 0%{?fedora} >= 33

  Patch1:     %{name}-support-python-3.9.diff

- %endif

  

  # Development stuff

  BuildRequires:  boost-devel
@@ -203,6 +201,11 @@ 

  # Fix all Python shebangs recursively in .

  pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .

  

+ # Use c++14 in order to fix build errors when including headers

+ # from the latest version of openvdb.

+ # Upstream issue: https://github.com/AcademySoftwareFoundation/openvdb/issues/795

+ sed -i 's|${CMAKE_CXX_FLAGS} -std=c++11|${CMAKE_CXX_FLAGS} -std=c++14|' CMakeLists.txt

+ 

  %build

  %cmake . \

  %ifnarch %{ix86} x86_64
@@ -306,6 +309,9 @@ 

  %{_metainfodir}/%{name}-fonts.metainfo.xml

  

  %changelog

+ * Tue Aug 25 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:2.83.5-3

+ - Use c++14 for properly building with the latest version of openvdb

+ 

  * Mon Aug 24 2020 Simone Caronni <negativo17@gmail.com> - 1:2.83.5-2

  - Be consistent with build options format and distribution conditionals.

  - rpmlint fixes.

no initial comment

This is not verified yet that it compiles successfully. Running currently a local build and waiting for the koji CI to verify the results.

simple koji ci failed with: Bad file: /chroot_tmpdir/srpm_unpacked/SOURCES/blender-support-python-3.9.diff: No such file or directory

rebased onto 5d518ff

a year ago

Changed the SPEC conditional to always include the Python 3.9 patch file. Previously it was set to only include it in F33+

And it seems that the SRPM was created in a F30 buildroot and then it was building for rawhide, so essentially the SRPM wasn't including the required file.

rebased onto e677f8f

a year ago

Thank you for the fix. Merging.

Pull-Request has been merged by luya

a year ago

While the PR fixes the issue with openvdb, it seems there is yet another issue on s390x.

All the arches build successfully, however on s390x I get this:

make[2]: [source/blender/makesrna/intern/CMakeFiles/bf_rna.dir/build.make:84: source/blender/makesrna/intern/rna_ID_gen.c] Aborted (core dumped)
gmake[2]: Leaving directory '/builddir/build/BUILD/blender-2.83.5/s390x-redhat-linux-gnu'
gmake[1]:
[CMakeFiles/Makefile2:5805: source/blender/makesrna/intern/CMakeFiles/bf_rna.dir/all] Error 2
gmake[1]: *** Waiting for unfinished jobs....

Then excluding S390x as a secondary architecture from the build will be the workaround until the team fixes it.