diff --git a/Golden_Repo/b/Boost/Boost-1.77.0-GCCcore-11.2.0.eb b/Golden_Repo/b/Boost/Boost-1.77.0-GCCcore-11.2.0.eb
index 11d41ed850b0c3a6e9668118eb11db85860b84a8..9b6187fa0f18150b8723d1f3a126ac16a55c4559 100644
--- a/Golden_Repo/b/Boost/Boost-1.77.0-GCCcore-11.2.0.eb
+++ b/Golden_Repo/b/Boost/Boost-1.77.0-GCCcore-11.2.0.eb
@@ -13,7 +13,6 @@ toolchainopts = {'pic': True}
source_urls = [
'https://boostorg.jfrog.io/artifactory/main/release/%(version)s/source/']
sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
-patches = [('676.patch',2)]
checksums = ['5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131']
dependencies = [
diff --git a/Golden_Repo/b/Boost/boost-deprheaders-pr676.patch b/Golden_Repo/b/Boost/boost-deprheaders-pr676.patch
deleted file mode 100644
index caf6afdccb91d958c00fdb7aea74b30251c358a7..0000000000000000000000000000000000000000
--- a/Golden_Repo/b/Boost/boost-deprheaders-pr676.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 3d3d2d7467cf9e0e8dc3220cf1a2badb321df099 Mon Sep 17 00:00:00 2001
-From: Matt Borland <matt@mattborland.com>
-Date: Sun, 22 Aug 2021 19:53:29 +0300
-Subject: [PATCH] Fix for issue 675
-
----
- .../boost/math/tools/header_deprecated.hpp | 22 ++++++++++++++-----
- test/Jamfile.v2 | 1 +
- test/header_deprecated_test.cpp | 12 ++++++++++
- 3 files changed, 29 insertions(+), 6 deletions(-)
- create mode 100644 test/header_deprecated_test.cpp
-
-diff --git a/include/boost/math/tools/header_deprecated.hpp b/include/boost/math/tools/header_deprecated.hpp
-index 8f4a5db25b..867fcaa217 100644
---- a/include/boost/math/tools/header_deprecated.hpp
-+++ b/include/boost/math/tools/header_deprecated.hpp
-@@ -6,12 +6,22 @@
- #ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
- #define BOOST_MATH_TOOLS_HEADER_DEPRECATED
-
--#ifdef _MSC_VER
--// Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
--#else // GNU, Clang, Intel, IBM, etc.
-+#ifndef BOOST_MATH_STANDALONE
-+
-+# include <boost/config/header_deprecated.hpp>
-+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
-+
-+#else
-+
-+# ifdef _MSC_VER
- // Expands to "This header is deprecated; use expr instead."
--#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
--#endif
-+# define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
-+# else // GNU, Clang, Intel, IBM, etc.
-+// Expands to "This header is deprecated use expr instead"
-+# define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
-+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
-+# endif
-+
-+#endif // BOOST_MATH_STANDALONE
-
- #endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED
-diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
-index 6ef83e630b..1653cb545e 100644
---- a/test/Jamfile.v2
-+++ b/test/Jamfile.v2
-@@ -874,6 +874,7 @@ test-suite mp :
- ;
-
- test-suite misc :
-+ [ run header_deprecated_test.cpp ]
- [ run threading_sanity_check.cpp ]
- [ run test_tr1.cpp
- ../build//boost_math_tr1
-diff --git a/test/header_deprecated_test.cpp b/test/header_deprecated_test.cpp
-new file mode 100644
-index 0000000000..2f131ae772
---- /dev/null
-+++ b/test/header_deprecated_test.cpp
-@@ -0,0 +1,12 @@
-+// (C) Copyright Matt Borland 2021.
-+// Use, modification and distribution are subject to the
-+// Boost Software License, Version 1.0. (See accompanying file
-+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-+
-+#include <boost/math/tools/header_deprecated.hpp>
-+
-+int main()
-+{
-+ BOOST_MATH_HEADER_DEPRECATED("<boost/integer/common_factor_rt.hpp>");
-+ return 0;
-+}
diff --git a/Golden_Repo/o/OptiX/OptiX-6.5.0.eb b/Golden_Repo/o/OptiX/OptiX-6.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8a39fc61821761ce50dda567f2be0ad7bdca2a6f
--- /dev/null
+++ b/Golden_Repo/o/OptiX/OptiX-6.5.0.eb
@@ -0,0 +1,31 @@
+##
+# Author: Robert Mijakovic <robert.mijakovic@lxp.lu>
+##
+easyblock = 'Binary'
+
+name = 'OptiX'
+version = '6.5.0'
+
+homepage = 'https://developer.nvidia.com/optix'
+description = """OptiX is NVIDIA SDK for easy ray tracing performance.
+ It provides a simple framework for accessing the GPU’s massive ray tracing
+ power using state-of-the-art GPU algorithms."""
+
+toolchain = SYSTEM
+
+# Registration required. Download links:
+# https://developer.nvidia.com/designworks/optix/download
+# https://developer.nvidia.com/designworks/optix/downloads/legacy
+sources = ['NVIDIA-OptiX-SDK-%(version)s-linux64.sh']
+#checksums = ['1a87b6c08577feeaaad0919b54a8b09b93245fbbf9d52f38497f78d485fea555']
+
+install_cmd = "./" + sources[0] + " --skip-license --prefix=%(installdir)s"
+
+sanity_check_paths = {
+ 'files': ["include/optix.h", "include/optix_device.h"],
+ 'dirs': []
+}
+
+modextravars = {'OPTIX_HOME': '%(installdir)s'}
+
+moduleclass = 'vis'
diff --git a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10.eb b/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
similarity index 89%
rename from Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10.eb
rename to Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
index ebb89b3d0b542195dd8578c922da617ffeab605d..fa6377c32c4da072e955a43495fc2f8a73b3dd38 100644
--- a/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10.eb
+++ b/Golden_Repo/p/POV-Ray/POV-Ray-3.7.0.10-GCCcore-11.2.0.eb
@@ -21,12 +21,15 @@ description = """The Persistence of Vision Raytracer, or POV-Ray, is a ray traci
of computer platforms. POV-Ray is a high-quality, Free Software tool for creating stunning
three-dimensional graphics. The source code is available for those wanting to do their own ports."""
-toolchain = {'name': 'GCC', 'version': '11.2.0'}
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
toolchainopts = {'pic': True}
source_urls = ['https://github.com/POV-Ray/povray/archive/']
sources = ['v%(version)s.tar.gz']
-patches = ['POV-Ray-3.7.0.7_dont-touch-home.patch']
+patches = [
+ 'POV-Ray-3.7.0.7_dont-touch-home.patch',
+ 'POV-Ray-3.7.0.10_boost-1.77-fix.patch',
+]
checksums = [
'7bee83d9296b98b7956eb94210cf30aa5c1bbeada8ef6b93bb52228bbc83abff', # v3.7.0.10.tar.gz
'45103afca808e279dcdee80194c65e2a760c76d011d351392a46e817b0b655f7', # POV-Ray-3.7.0.7_dont-touch-home.patch
@@ -37,7 +40,7 @@ builddependencies = [
]
dependencies = [
- ('Boost', '1.77.0'),
+ ('Boost', '1.78.0'),
('zlib', '1.2.11'),
('libpng', '1.6.37'),
('libjpeg-turbo', '2.1.1'),
@@ -51,6 +54,7 @@ preconfigopts += " ./prebuild.sh && cd .. && "
configopts = "COMPILED_BY='EasyBuild' "
configopts += "--with-boost=$EBROOTBOOST --with-zlib=$EBROOTZLIB --with-libpng=$EBROOTLIBPNG "
configopts += "--with-libtiff=$EBROOTLIBTIFF --with-libjpeg=$EBROOTLIBJPEGMINTURBO --with-libsdl=$EBROOTSDL2 "
+configopts += "CXXFLAGS='-DBOOST_BIND_GLOBAL_PLACEHOLDERS ' "
# configopts += " --with-libmkl=DIR " ## upstream needs to fix this, still in BETA
runtest = 'check'
diff --git a/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb b/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
index 142ff9607be89aefb4a5921f17e3a33ad71628a6..a3526af7b55e81f06be892fa78948d7dd1167a1b 100644
--- a/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
+++ b/Golden_Repo/v/VMD/VMD-1.9.4a51-gcccoremkl-11.2.0-2021.4.0.eb
@@ -58,7 +58,7 @@ dependencies = [
('FFmpeg', '4.4.1'),
('ImageMagick', '7.1.0-13'),
('ACTC', '1.1'),
- ('OptiX', '7.3.0', '', SYSTEM),
+ ('OptiX', '6.5.0', '', SYSTEM),
('zlib', '1.2.11'),
('libpng', '1.6.37'),
('POV-Ray', '3.7.0.10'),