Commit 1c5f7eab authored by Markus Kowalewski's avatar Markus Kowalewski
Browse files

slurm: remove pmix-configure.patch

Use --without-rpath instead. This leads to the correct
configuration, that picks up the the correct dlopen path
at runtime. Verified with nixos/tests/slurm.nix.
parent 90150352
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
    # increase string length to allow for full
    # path of 'echo' in nix store
    ./common-env-echo.patch
    # Required for configure to pick up the right dlopen path
    ./pmix-configure.patch
  ];

  prePatch = ''
@@ -72,6 +70,7 @@ stdenv.mkDerivation rec {
      "--sysconfdir=/etc/slurm"
      "--with-pmix=${pmix}"
      "--with-bpf=${libbpf}"
      "--without-rpath" # Required for configure to pick up the right dlopen path
    ] ++ (optional enableGtk2  "--disable-gtktest")
      ++ (optional (!enableX11) "--disable-x11");

+0 −13
Original line number Diff line number Diff line
diff --git a/configure b/configure
index 1cf53bc..ab68441 100755
--- a/configure
+++ b/configure
@@ -21207,7 +21207,7 @@ rm -f conftest.err conftest.i conftest.$ac_ext
                 as_fn_error $? "error processing $x_ac_cv_pmix_libdir: PMIx v3.x was already found in one of the previous paths" "$LINENO" 5
               fi
               _x_ac_pmix_v3_found="1"
-              PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include"
+              PMIX_V3_CPPFLAGS="-I$x_ac_cv_pmix_dir/include -DPMIXP_V3_LIBPATH=\\\"$x_ac_cv_pmix_libdir\\\""
               if test "$ac_with_rpath" = "yes"; then
                 PMIX_V3_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_pmix_libdir -L$x_ac_cv_pmix_libdir"
               else