sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
termux-packages/packages/openfoam/etc-config.sh-CGAL.patch

14 lines
595 B
Diff
Raw Normal View History

openfoam: update to 21.06 Finally a working build :) Tests done: run cavity tutorial on aarch64 and arm. TODO/things that would be nice to test: * Check if we actually need to set WM_{CC,CXX,CFLAGS,CXXFLAGS} in etc/config.sh/settings. * Test compilation with Gcc on device * Look at the __libc_malloc->malloc patch in sigFpe.C again, and try to upstream the fix so that it isn't as glibc specific. We need to remove -std=c++11 from CXXFLAGS, or else we get errors when building with our (rather new) version of CGAL, for example: /data/data/com.termux/files/usr/include/CGAL/array.h:72:44: error: no template named 'index_sequence' in namespace 'std' make_filled_array_aux(const T& value, std::index_sequence<Is...>) ~~~~~^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:10: warning: 'decltype(auto)' type specifier is a C++14 extension [-Wc++14-extensions] decltype(auto) approximate_sqrt(const NT& nt) ^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:1: error: deduced return types are a C++14 extension decltype(auto) approximate_sqrt(const NT& nt) ^
2020-07-12 09:15:11 +02:00
--- ./etc/config.sh/CGAL.orig 2020-07-04 12:28:32.082903795 +0200
+++ ./etc/config.sh/CGAL 2020-07-04 12:30:22.704797834 +0200
@@ -43,8 +43,8 @@
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
openfoam: update to 21.06 Finally a working build :) Tests done: run cavity tutorial on aarch64 and arm. TODO/things that would be nice to test: * Check if we actually need to set WM_{CC,CXX,CFLAGS,CXXFLAGS} in etc/config.sh/settings. * Test compilation with Gcc on device * Look at the __libc_malloc->malloc patch in sigFpe.C again, and try to upstream the fix so that it isn't as glibc specific. We need to remove -std=c++11 from CXXFLAGS, or else we get errors when building with our (rather new) version of CGAL, for example: /data/data/com.termux/files/usr/include/CGAL/array.h:72:44: error: no template named 'index_sequence' in namespace 'std' make_filled_array_aux(const T& value, std::index_sequence<Is...>) ~~~~~^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:10: warning: 'decltype(auto)' type specifier is a C++14 extension [-Wc++14-extensions] decltype(auto) approximate_sqrt(const NT& nt) ^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:1: error: deduced return types are a C++14 extension decltype(auto) approximate_sqrt(const NT& nt) ^
2020-07-12 09:15:11 +02:00
-boost_version=boost_1_66_0
-cgal_version=CGAL-4.12.2
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
+boost_version=boost-system
openfoam: update to 21.06 Finally a working build :) Tests done: run cavity tutorial on aarch64 and arm. TODO/things that would be nice to test: * Check if we actually need to set WM_{CC,CXX,CFLAGS,CXXFLAGS} in etc/config.sh/settings. * Test compilation with Gcc on device * Look at the __libc_malloc->malloc patch in sigFpe.C again, and try to upstream the fix so that it isn't as glibc specific. We need to remove -std=c++11 from CXXFLAGS, or else we get errors when building with our (rather new) version of CGAL, for example: /data/data/com.termux/files/usr/include/CGAL/array.h:72:44: error: no template named 'index_sequence' in namespace 'std' make_filled_array_aux(const T& value, std::index_sequence<Is...>) ~~~~~^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:10: warning: 'decltype(auto)' type specifier is a C++14 extension [-Wc++14-extensions] decltype(auto) approximate_sqrt(const NT& nt) ^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:1: error: deduced return types are a C++14 extension decltype(auto) approximate_sqrt(const NT& nt) ^
2020-07-12 09:15:11 +02:00
+cgal_version=cgal-system
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
openfoam: update to 21.06 Finally a working build :) Tests done: run cavity tutorial on aarch64 and arm. TODO/things that would be nice to test: * Check if we actually need to set WM_{CC,CXX,CFLAGS,CXXFLAGS} in etc/config.sh/settings. * Test compilation with Gcc on device * Look at the __libc_malloc->malloc patch in sigFpe.C again, and try to upstream the fix so that it isn't as glibc specific. We need to remove -std=c++11 from CXXFLAGS, or else we get errors when building with our (rather new) version of CGAL, for example: /data/data/com.termux/files/usr/include/CGAL/array.h:72:44: error: no template named 'index_sequence' in namespace 'std' make_filled_array_aux(const T& value, std::index_sequence<Is...>) ~~~~~^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:10: warning: 'decltype(auto)' type specifier is a C++14 extension [-Wc++14-extensions] decltype(auto) approximate_sqrt(const NT& nt) ^ /data/data/com.termux/files/usr/include/CGAL/number_utils.h:320:1: error: deduced return types are a C++14 extension decltype(auto) approximate_sqrt(const NT& nt) ^
2020-07-12 09:15:11 +02:00
export BOOST_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version"
export CGAL_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version"