Commit 08c38755 authored by Mehdi Dogguy's avatar Mehdi Dogguy

Fix an rpath issue

parent 20118a23
usr/include/slurm/pmi.h
usr/include/slurm-wlm/pmi.h
usr/lib/*/libpmi.a
usr/lib/*/libpmi.la
usr/lib/*/libpmi.so
usr/include/slurm/pmi2.h
usr/include/slurm-wlm/pmi2.h
usr/lib/*/libpmi2.a
usr/lib/*/libpmi2.la
usr/lib/*/libpmi2.so
usr/include/slurm/slurm_errno.h
usr/include/slurm/slurm.h
usr/include/slurm/smd_ns.h
usr/include/slurm/spank.h
usr/include/slurm-wlm/slurm_errno.h
usr/include/slurm-wlm/slurm.h
usr/include/slurm-wlm/smd_ns.h
usr/include/slurm-wlm/spank.h
usr/lib/*/libslurm.a
usr/lib/*/libslurm.la
usr/lib/*/libslurm.so
usr/include/slurm/slurmdb.h
usr/include/slurm-wlm/slurmdb.h
usr/lib/*/libslurmdb.a
usr/lib/*/libslurmdb.la
usr/lib/*/libslurmdb.so
Description: Fix an rpath issue
The libdir has to match the source package name in order to host
slurm's private shared library.
Author: Mehdi Dogguy <mehdi@debian.org>
Forwarded: no
Last-Update: 2018-01-12
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
dnl Prologue
dnl
-AC_INIT(slurm, m4_esyscmd([perl -ne 'print,exit if s/^\s*VERSION:\s*(\d*.\d*).\S*/\1/i' ./META | sed 's/^v//' | tr '-' '_' | tr -d '\n']), [], [], [https://slurm.schedmd.com])
+AC_INIT(slurm-wlm, m4_esyscmd([perl -ne 'print,exit if s/^\s*VERSION:\s*(\d*.\d*).\S*/\1/i' ./META | sed 's/^v//' | tr '-' '_' | tr -d '\n']), [], [], [https://slurm.schedmd.com])
AC_PREREQ(2.59)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([auxdir])
--- a/auxdir/slurm.m4
+++ b/auxdir/slurm.m4
@@ -120,10 +120,10 @@
# You will notice " or ' each does something different when resolving
# variables. Some need to be resolved now ($libdir) and others
# ($(top_builddir)) need to be resolved when dealing with the Makefile.am's
- LIB_SLURM="-Wl,-rpath=$libdir/slurm"
+ LIB_SLURM="-Wl,-rpath=$libdir/slurm-wlm"
LIB_SLURM+=' -L$(top_builddir)/src/api/.libs -lslurmfull'
- LIB_SLURMDB="-Wl,-rpath=$libdir/slurm"
+ LIB_SLURMDB="-Wl,-rpath=$libdir/slurm-wlm"
LIB_SLURMDB+=' -L$(top_builddir)/src/api/.libs -L$(top_builddir)/src/db_api/.libs -lslurmdb -lslurmfull'
AC_MSG_RESULT([shared]);
fi
......@@ -2,3 +2,4 @@ mail-path
remove-google-javascript
sacctmgr-increase-buffer
pidfile-path
rpath
......@@ -121,6 +121,6 @@ override_dh_strip:
dh_strip -plibslurm-dev --no-automatic-dbgsym
dh_strip -pslurm-wlm-basic-plugins-dev --no-automatic-dbgsym
strip --strip-debug --remove-section=.comment \
--remove-section=.note debian/slurm-wlm-basic-plugins-dev/usr/lib/*/slurm/*.a
--remove-section=.note debian/slurm-wlm-basic-plugins-dev/usr/lib/*/slurm-wlm/*.a
override_dh_auto_test:
usr/lib/*/slurm/*.la
usr/lib/*/slurm/*.a
usr/lib/*/slurm-wlm/*.la
usr/lib/*/slurm-wlm/*.a
usr/lib/*/slurm/*.so
usr/lib/*/slurm-wlm/*.so
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment