59 lines
2.8 KiB
Diff
59 lines
2.8 KiB
Diff
|
From 46bea350d06e9c8e1f93938ce2b2bd04a1c3bf3f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Egbert Eich <eich@suse.com>
|
||
|
|
Date: Wed, 8 Jan 2020 20:56:25 +0100
|
||
|
|
Subject: [PATCH] Remove rpath from build
|
||
|
|
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||
|
|
---
|
||
|
|
contribs/perlapi/libslurm/perl/Makefile.PL.in | 4 ++--
|
||
|
|
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 e8f8aff54d..b51f53f412 100644
|
||
|
|
--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in
|
||
|
|
+++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in
|
||
|
|
@@ -68,7 +68,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,@libdir@';
|
||
|
|
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
|
||
|
|
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
|
||
|
|
if $os =~ "aix";
|
||
|
|
|
||
|
|
@@ -79,7 +79,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@libdir@ -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 4fb38b9725..148efa6e82 100644
|
||
|
|
--- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
|
||
|
|
+++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
|
||
|
|
@@ -68,7 +68,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,@libdir@';
|
||
|
|
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
|
||
|
|
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
|
||
|
|
if $os =~ "aix";
|
||
|
|
|
||
|
|
@@ -79,7 +79,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@libdir@ -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:
|
||
|
|
--
|
||
|
|
2.42.1
|
||
|
|
|