Compile G4 with a gloabal dynamic TLS model

It avoid th LD_PRELOAD solution
OpenGATE · Dec 13, 2024 · 87de411 · 87de411
1 parent 2c08eb8
commit 87de411
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/Dockerfile_opengate_core b/.github/workflows/Dockerfile_opengate_core
@@ -24,7 +24,7 @@ RUN     yum install -y gcc wget git expat-devel fftw-devel qt5-qtbase-devel free
     &&  cd /software/geant4 \
     &&  git clone --branch v11.2.1 https://github.com/Geant4/geant4.git --depth 1 src \
     &&  cd bin \
-    &&  cmake -DCMAKE_CXX_FLAGS=-std=c++17 -DGEANT4_BUILD_MULTITHREADED=ON -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=OFF -DGEANT4_INSTALL_DATADIR=/sofware/geant4/data -DGEANT4_USE_QT=ON -DGEANT4_USE_OPENGL_X11=ON ../src \
+    &&  cmake -DCMAKE_CXX_FLAGS=-std=c++17 -DGEANT4_BUILD_MULTITHREADED=ON -DGEANT4_USE_GDML=ON -DGEANT4_INSTALL_DATA=OFF -DGEANT4_INSTALL_DATADIR=/sofware/geant4/data -DGEANT4_USE_QT=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_BUILD_TLS_MODEL=global-dynamic ../src \
     &&  make -j10 \
     &&  source /software/geant4/bin/geant4make.sh \
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -121,7 +121,7 @@ jobs:
             export PYTHONFOLDER="cp312-cp312"
           fi
           mkdir -p $HOME/software
-          docker run --rm -e "PYTHONFOLDER=${PYTHONFOLDER}" -v $GITHUB_WORKSPACE:/home tbaudier/opengate_core:${{ env.GEANT4_VERSION }} /home/.github/workflows/createWheelLinux.sh
+          docker run --rm -e "PYTHONFOLDER=${PYTHONFOLDER}" -v $GITHUB_WORKSPACE:/home tbaudier/opengate_core:${{ env.GEANT4_VERSION }}_preload /home/.github/workflows/createWheelLinux.sh
           ls wheelhouse
           rm -rf dist
           mv wheelhouse dist