sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
a631713004
termux-packages/packages/openfoam/etc-bashrc.patch

41 lines
1.7 KiB
Diff
Raw Normal View History

openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
--- ./etc/bashrc.orig 2021-12-20 19:57:43.000000000 +0100
+++ ./etc/bashrc 2022-02-08 17:16:21.817030684 +0100
@@ -69,7 +69,7 @@
# = Gcc | Clang | Icc | Icx | Amd | Arm | Cray | Fujitsu |
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
# Gcc<digits> | Clang<digits>
openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
# [Not well tested: Pgi | Nvidia]
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 WM_COMPILER=Gcc
+export WM_COMPILER=Clang
# [WM_PRECISION_OPTION] - Floating-point precision:
# = DP | SP | SPDP
openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
@@ -114,8 +114,8 @@
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
# --
projectDir="${BASH_SOURCE:-${ZSH_NAME:+$0}}";
[ -n "$projectDir" ] && projectDir="$(\cd $(dirname $projectDir)/.. && \pwd -L)" ||\
-projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
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
-# projectDir="/opt/openfoam/OpenFOAM-$WM_PROJECT_VERSION"
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
+# projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
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
+projectDir="@TERMUX_PREFIX@/opt/OpenFOAM-$WM_PROJECT_VERSION"
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
# projectDir="/usr/local/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
################################################################################
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
# Or optionally hard-coded (eg, with autoconfig)
openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
@@ -164,7 +164,7 @@
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
# Capture values of old directories to be cleaned from PATH, LD_LIBRARY_PATH
foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
- $HOME/$WM_PROJECT/${USER:-user} $FOAM_USER_APPBIN $FOAM_USER_LIBBIN \
+ $HOME/$WM_PROJECT/${USER:-termux} $FOAM_USER_APPBIN $FOAM_USER_LIBBIN \
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
$WM_PROJECT_SITE $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN \
$FOAM_MODULE_APPBIN $FOAM_MODULE_LIBBIN"
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.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
@@ -172,7 +172,7 @@
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
export WM_PROJECT_DIR="$projectDir"
# [WM_PROJECT_USER_DIR] - Location of user files
openfoam: update to 21.12 Package needs to be rebuilt for new boost version, so take the opportunity to update to latest release at the same time.
2022-02-08 18:28:59 +01:00
-export WM_PROJECT_USER_DIR="$HOME/$WM_PROJECT/${USER:-user}-$WM_PROJECT_VERSION"
+export WM_PROJECT_USER_DIR="$HOME/$WM_PROJECT/${USER:-termux}-$WM_PROJECT_VERSION"
OpenFOAM: add package Build takes waaay to long for CI so: %ci:no-build
2017-11-22 19:40:17 +01:00
# [WM_PROJECT_SITE] - Location of site-specific (group) files
# Default (unset) implies WM_PROJECT_DIR/site
Reference in New Issue Copy Permalink