debuggable installations in eic/containers: wire --debug-source and --debug-symbols into the dbg environment

containers/eic/Dockerfile

@@ -46,6 +46,7 @@ ARG ENV=xl
 ENV SPACK_ENV=/opt/spack-environment/${ENV}
 ARG SPACK_FLAGS="--backtrace"
 ARG SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
+ARG SPACK_BUILDER_INSTALL_FLAGS="${SPACK_INSTALL_FLAGS}"
 ENV SPACK_COLOR="always"
 ENV GIT_TERMINAL_PROMPT=0
 
@@ -79,7 +80,7 @@ RUN --mount=type=cache,target=/ccache,id=ccache-${TARGETPLATFORM}              \
     <<EOF
 set -e
 export CCACHE_DIR=/ccache
-spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS}
+spack ${SPACK_FLAGS} install ${SPACK_BUILDER_INSTALL_FLAGS}
 spack clean --downloads --stage
 ccache --show-stats
 ccache --zero-stats
@@ -195,7 +196,7 @@ RUN --mount=type=cache,target=/ccache,id=ccache-${TARGETPLATFORM}              \
     <<EOF
 set -e
 export CCACHE_DIR=/ccache
-spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS}
+spack ${SPACK_FLAGS} install ${SPACK_BUILDER_INSTALL_FLAGS}
 spack clean --downloads --stage
 spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin
 ccache --show-stats

scripts/build-eic.sh

@@ -204,6 +204,15 @@ for build_type in "${BUILD_TYPES[@]}"; do
   # shellcheck disable=SC2206  # word splitting is intentional: BUILD_OPTIONS is a space-separated list
   build_cmd+=(${BUILD_OPTIONS})
 
+  ## Compute install flags: base flags plus debug capture for the dbg environment
+  SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
+  SPACK_BUILDER_INSTALL_FLAGS="${SPACK_INSTALL_FLAGS}"
+  if [ "${ENV}" = "dbg" ]; then
+    SPACK_BUILDER_INSTALL_FLAGS="${SPACK_BUILDER_INSTALL_FLAGS} --no-cache --debug-source --debug-symbols"
+  fi
+  build_cmd+=(--build-arg "SPACK_INSTALL_FLAGS=${SPACK_INSTALL_FLAGS}")
+  build_cmd+=(--build-arg "SPACK_BUILDER_INSTALL_FLAGS=${SPACK_BUILDER_INSTALL_FLAGS}")
+
   ## Output mode: push-by-digest in all CI modes; load locally
   if [ "${CI_MODE}" != "local" ]; then
     ## Push by digest; CI wrapper creates final tags via imagetools create.

spack-environment/dbg/epic/spack.yaml

@@ -5,6 +5,10 @@ spack:
   - ../../config.yaml
   - ../../packages.yaml
   - ../../view.yaml
+  packages:
+    compiler-wrapper:
+      require:
+      - '@1.1.0-build-id'
   specs:
   - algorithms build_type=Debug
   - edm4eic build_type=Debug

spack-environment/dbg/spack.yaml

@@ -5,12 +5,16 @@ spack:
   - ../packages.yaml
   - ../packages_root_without_opengl.yaml
   - ../view.yaml
+  packages:
+    compiler-wrapper:
+      require:
+      - '@1.1.0-build-id'
   specs:
   - acts build_type=Debug
   - cmake
   - dd4hep build_type=Debug
   - edm4hep build_type=Debug
-  - gdb
+  - gdb ^elfutils@0.194+debuginfod
   - irt build_type=Debug
   - jana2 build_type=Debug
   - valgrind

spack-environment/xl/spack.yaml

@@ -22,8 +22,6 @@ spack:
   - cnpy
   - covfie
   - cppcoro
-  - dawn
-  - dawncut
   - dd4hep
   - doxygen
   - east

spack-packages.sh

@@ -45,6 +45,8 @@ c44cd71db91d6e6c68cb604dcb87311b49b1bedb
 683c5a698d88d657a99f3adefee0fe98d30927ae
 409826414a2221be56011f8f0f912905dae558cd
 63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51
+4b54f295bed925f1a33f3954bd05903e53142406
+5945d81a8359eed559ec60b1be9151de57473f51
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -87,3 +89,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## 683c5a698d88d657a99f3adefee0fe98d30927ae: dd4hep: url_for_version for master version
 ## 409826414a2221be56011f8f0f912905dae558cd: podio: Add version 1.8 and new parquet variant
 ## 63b8b9c3ac8ddcb2b9aafcd8160ff33bd6210f51: edm4hep: patch for new podio arrow targets
+## 4b54f295bed925f1a33f3954bd05903e53142406: compiler-wrapper: add 1.1.0-build-id prototype version (spack-packages#6214)
+## 5945d81a8359eed559ec60b1be9151de57473f51: elfutils: patch debuginfod_find_source to accept ./-relative filenames (spack-packages #6259)

spack.sh

@@ -12,6 +12,7 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
 --- || true
 292b0dcaba3b2a5e3f9668d205d39fee2c715721
 678e506a95b319c573ba7e84703b06d7275ab80e
+5c3ac95eb728653e677f5e6caee39f34f8ae8249
 ---
 ## Optional hash table with comma-separated file list
 read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
@@ -21,3 +22,6 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
 ## [hash]: [description]
 ## 292b0dcaba3b2a5e3f9668d205d39fee2c715721: fix: write created time field with OCI buildcache config
 ## 678e506a95b319c573ba7e84703b06d7275ab80e: fix: don't map prefix to view root for pkgs excluded from view
+## 5c3ac95eb728653e677f5e6caee39f34f8ae8249: feat: debuggable installations (source hook, symbol
+##   splitting, gdbinit, OCI autopush) plus debuginfod, squashed and cherry-picked via open draft
+##   PR spack/spack#52949