Merge branch 'fix_and_add_hxtorch_2.0-rc8_again2' into 'master'

Add hxtorch@2.0-rc8 to environment

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!126

packages/hxtorch/package.py

@@ -89,14 +89,16 @@ class Hxtorch(WafPackage):
             print("libs: manually adding ", self.spec['llvm'].prefix.lib)
             library.append(self.spec['llvm'].prefix.lib)
 
-        # explicitly add googletest library if it isn't found above
+        # explicitly add googletest library if it isn't found above;
+        # adding in front of the list of libraries is a hack to circumvent
+        # issues from vendoring packages like pthreadpool
         if not any('googletest' in lib for lib in library):
             if os.path.isdir(self.spec['googletest'].prefix.lib64):
-                print("libs: manually adding ", self.spec['googletest'].prefix.lib64)
-                library.append(self.spec['googletest'].prefix.lib64)
+                print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib64)
+                library.insert(0, self.spec['googletest'].prefix.lib64)
             if os.path.isdir(self.spec['googletest'].prefix.lib):
-                print("libs: manually adding ", self.spec['googletest'].prefix.lib)
-                library.append(self.spec['googletest'].prefix.lib)
+                print("libs: manually inserting at front ", self.spec['googletest'].prefix.lib)
+                library.insert(0, self.spec['googletest'].prefix.lib)
 
         env.set('CPATH', ':'.join(include))
         env.set('C_INCLUDE_PATH', ':'.join(include))

spack.yaml

@@ -30,7 +30,7 @@ spack:
     - py-formencode
     - tvb-framework ^binutils+ld+gold
     - pynn-brainscales@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
-    #- hxtorch@2.0-rc6 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+    - hxtorch@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
     - py-neo
     #- py-cerebstats
     #- py-cerebunit