testing local dep for plugins

Author: maureeungaro

.github/workflows/sanitize.yaml

@@ -71,6 +71,30 @@ jobs:
           
           echo "Manual build for sanitizer: ${{ matrix.sanitizer }} completed"
 
+      - name: Package sanitizer logs
+        if: ${{ always() }}
+        shell: bash
+        run: |
+          set -euo pipefail
+          src="/root/src/logs"
+          outdir="$GITHUB_WORKSPACE/_artifacts"
+          mkdir -p "$outdir"
+
+          if [[ -d "$src" ]]; then
+            tar -C "/root/src" -czf "$outdir/logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}.tgz" "logs"
+            echo "Packaged logs from $src"
+          else
+            echo "No logs directory at $src"
+          fi
+
+      - name: Upload sanitizer logs (artifact)
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}
+          path: ${{ github.workspace }}/_artifacts/logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}.tgz
+          if-no-files-found: warn
+          retention-days: 14
 
   build-with-sanitizer-final:
     name: Sanitize - summary
@@ -87,3 +111,4 @@ jobs:
       - name: Pass
         run: |
           echo "### All sanitizer jobs passed." >> $GITHUB_STEP_SUMMARY
+          echo "### Uploaded artifact: logs-${{ matrix.baseos }}-${{ matrix.arch }}-${{ matrix.sanitizer }}" >> $GITHUB_STEP_SUMMARY

meson.build

@@ -29,6 +29,7 @@ all_libs = []
 all_includes = []
 empty_dict = { 'na' : [''] }
 all_lib_names = []  # Store library names as linker flags
+lib_target_maps = {}
 python_exe = import('python').find_installation('python3')
 
 
@@ -51,6 +52,7 @@ subdir('gdata')
 subdir('gdynamicDigitization')
 subdir('eventDispenser')
 subdir('gqtbuttonswidget')
+subdir('gstreamer')
 subdir('g4display')
 subdir('g4dialog')
 subdir('gboard')
@@ -59,7 +61,6 @@ subdir('g4system')
 subdir('gparticle')
 subdir('gphysics')
 subdir('gsplash')
-subdir('gstreamer')
 subdir('gsd') # TODO: example
 subdir('gfields')
 subdir('gdetector')
@@ -106,6 +107,7 @@ foreach L : LD
         if not all_libs.contains(this_library)
             all_libs += this_library
             all_lib_names += 'lib' + this_lib_name + '.a' # Add as linker flag
+            lib_target_maps += {this_lib_name: this_library}
         endif
     endif
 
@@ -122,7 +124,18 @@ foreach L : LD
             if not sources.contains('')
                 plugin_link_with = [this_library]
             endif
-
+            if lib_target_maps.has_key('gtouchable')
+                plugin_link_with += [lib_target_maps['gtouchable']]
+            endif
+            if lib_target_maps.has_key('gdata')
+                plugin_link_with += [lib_target_maps['gdata']]
+            endif
+            if lib_target_maps.has_key('gtranslationTable')
+                plugin_link_with += [lib_target_maps['gtranslationTable']]
+            endif
+            if lib_target_maps.has_key('ghit')
+                plugin_link_with += [lib_target_maps['ghit']]
+            endif
             shared_library(
                 name,
                 sources[0],
@@ -132,7 +145,8 @@ foreach L : LD
                 link_with : plugin_link_with,
                 name_suffix : 'gplugin',
                 name_prefix : '',
-                override_options : ['b_staticpic=false']
+                # for shared modules, the static libraries they link must be PIC.
+                override_options : ['b_staticpic=true']
             )
 
         endforeach

meson/g4_pkgconfig.py

@@ -188,5 +188,6 @@ def generate_pkgconfig(install_prefix: Path,
 	generate_pkgconfig(install_dir, "geant4-config",
 					   "geant4_core.pc", "Geant4 Core",
 					   "Geant4 Simulation Toolkit (core, no graphical/GUI libs)",
-					   cflags_filter=filter_graphical_cflags)
+					   cflags_filter=filter_graphical_cflags,
+					   libs_filter=filter_graphical_libs)