forked from pool/slurm
Egbert Eich
fd9e32c9b0
- Removed autopatch as it doesn't work for the SLE-11-SP4 build. - pmix searches now also for libpmix.so.2 so that there is no dependency for devel package (bsc#1164386) * added patch file check-for-lipmix.so.MAJOR.patch * reworded patch file Remove-rpath-from-build.patch to use %autopatch OBS-URL: https://build.opensuse.org/request/show/780353 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=139
57 lines
2.9 KiB
Diff
57 lines
2.9 KiB
Diff
From: Egbert Eich <eich@suse.com>
|
|
Date: Wed Jan 8 20:56:25 2020 +0100
|
|
Subject: Remove rpath from build
|
|
Patch-mainline: never
|
|
Git-commit: f79af97c35f38775a7a90cd8e4b98814729d9a9c
|
|
References:
|
|
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
|
---
|
|
slurm-19.05.5/contribs/perlapi/libslurm/perl/Makefile.PL.in | 4 ++--
|
|
slurm-19.05.5/contribs/perlapi/libslurmdb/perl/Makefile.PL.in | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in b/contribs/perlapi/libslurm/perl/Makefile.PL.in
|
|
index fcae437..797c943 100644
|
|
--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in
|
|
+++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in
|
|
@@ -77,7 +77,7 @@ DESTDIR_BUG
|
|
# AIX has problems with not always having the correct
|
|
# flags so we have to add some :)
|
|
my $os = lc(`uname`);
|
|
-my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/api/.libs -Wl,-rpath,@prefix@/lib";
|
|
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
|
|
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
|
|
if $os =~ "aix";
|
|
|
|
@@ -88,7 +88,7 @@ WriteMakefile(
|
|
($] >= 5.005 ? ## Add these new keywords supported since 5.005
|
|
(ABSTRACT_FROM => 'lib/Slurm.pm', # retrieve abstract from module
|
|
AUTHOR => 'Hongjia Cao <hjcao@nudt.edu.cn>') : ()),
|
|
- LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib -lslurm"], # e.g., '-lm'
|
|
+ LIBS => ["-L@prefix@/lib -lslurm"], # e.g., '-lm'
|
|
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
|
|
INC => "-I. -I@top_srcdir@ -I@top_srcdir@/contribs/perlapi/common -I@top_builddir@",
|
|
# Un-comment this if you add C files to link with later:
|
|
diff --git a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
|
|
index 2db028c..83eb4e2 100644
|
|
--- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
|
|
+++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
|
|
@@ -76,7 +76,7 @@ DESTDIR_BUG
|
|
# AIX has problems with not always having the correct
|
|
# flags so we have to add some :)
|
|
my $os = lc(`uname`);
|
|
-my $other_ld_flags = "-Wl,-rpath,@top_builddir@/src/db_api/.libs -Wl,-rpath,@prefix@/lib";
|
|
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
|
|
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
|
|
if $os =~ "aix";
|
|
|
|
@@ -87,7 +87,7 @@ WriteMakefile(
|
|
($] >= 5.005 ? ## Add these new keywords supported since 5.005
|
|
(ABSTRACT_FROM => 'Slurmdb.pm', # retrieve abstract from module
|
|
AUTHOR => 'Don Lipari <lipari@llnl.gov>') : ()),
|
|
- LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib -lslurm"], # e.g., '-lm'
|
|
+ LIBS => ["-L@prefix@/lib -lslurmdb"], # e.g., '-lm'
|
|
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
|
|
INC => "-I. -I@top_srcdir@ -I@top_srcdir@/contribs/perlapi/common -I@top_builddir@",
|
|
# Un-comment this if you add C files to link with later:
|