From d3af1b27cf75a3473fec938c18ccbe7783a78382 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 28 Mar 2024 21:22:25 +0000
Subject: [PATCH] feat: use ld.so.conf.d to add paths
---
containers/jug/dev.Dockerfile | 7 +++++++
containers/jug/profile.d/z11_jug_env.sh | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index a3e965cbc..055bc0f1c 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -314,6 +314,13 @@ EOF
## set ROOT TFile forward compatibility
RUN sed -i 's/# \(TFile.v630forwardCompatibility:\) no/\1 yes/' /usr/local/etc/root/system.rootrc
+## Setup ld.so.conf with what could go in LD_LIBRARY_PATH (but lower priority)
+## Ref: https://man7.org/linux/man-pages/man8/ld.so.8.html
+COPY <<EOF /etc/ld.so.conf.d/eic-shell.conf
+/usr/local/lib/root
+EOF
+RUN ldconfig
+
## set the local spack configuration
ENV SPACK_DISABLE_LOCAL_CONFIG="true"
RUN <<EOF
diff --git a/containers/jug/profile.d/z11_jug_env.sh b/containers/jug/profile.d/z11_jug_env.sh
index 6bee8a70f..aea1a0ecd 100755
--- a/containers/jug/profile.d/z11_jug_env.sh
+++ b/containers/jug/profile.d/z11_jug_env.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-# FIXME: add ROOT libraries to LD_LIBRARY_PATH until removal can be tested
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/root
-
if [ ! -z ${EIC_SHELL_PREFIX} ]; then
if [ "$LD_LIBRARY_PATH" != *"${EIC_SHELL_PREFIX}/lib"* ]; then
export LD_LIBRARY_PATH=$EIC_SHELL_PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
--
GitLab