rpm/slurm
SHA256
1
0
Fork 0
forked from pool/slurm
Code Pull Requests Activity
af603b8163
slurm/Remove-rpath-from-build.patch

57 lines
2.9 KiB
Diff
Raw Normal View History

Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
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(-)
Accepting request 780353 from home:eeich:branches:network:cluster - 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
2020-02-28 18:43:45 +01:00
diff --git a/contribs/perlapi/libslurm/perl/Makefile.PL.in b/contribs/perlapi/libslurm/perl/Makefile.PL.in
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
index fcae437..797c943 100644
Accepting request 780353 from home:eeich:branches:network:cluster - 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
2020-02-28 18:43:45 +01:00
--- a/contribs/perlapi/libslurm/perl/Makefile.PL.in
+++ b/contribs/perlapi/libslurm/perl/Makefile.PL.in
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
@@ -77,7 +77,7 @@ DESTDIR_BUG
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
# 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";
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
if $os =~ "aix";
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
@@ -88,7 +88,7 @@ WriteMakefile(
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
($] >= 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:
Accepting request 780353 from home:eeich:branches:network:cluster - 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
2020-02-28 18:43:45 +01:00
diff --git a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
index 2db028c..83eb4e2 100644
Accepting request 780353 from home:eeich:branches:network:cluster - 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
2020-02-28 18:43:45 +01:00
--- a/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
+++ b/contribs/perlapi/libslurmdb/perl/Makefile.PL.in
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
@@ -76,7 +76,7 @@ DESTDIR_BUG
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
# 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";
- added correct link flags for perl bindings (bsc#1108671) * added correct linker search path in slurm-2.4.4-rpath.patch * perl:Switch is required by slurm torque wrappers OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=70
2018-09-24 11:37:13 +02:00
+my $other_ld_flags = "-L@top_builddir@/src/api/.libs -lslurm";
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
$other_ld_flags = " -brtl -G -bnoentry -bgcbypass:1000 -bexpfull"
if $os =~ "aix";
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
@@ -87,7 +87,7 @@ WriteMakefile(
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
($] >= 5.005 ? ## Add these new keywords supported since 5.005
(ABSTRACT_FROM => 'Slurmdb.pm', # retrieve abstract from module
AUTHOR => 'Don Lipari <lipari@llnl.gov>') : ()),
Accepting request 762650 from home:eeich:branches:network:cluster - Update to version 19.05.5 (jsc#SLE-8491) * Check %docdir/NEWS for details. * Includes security fixes CVE-2019-19727, CVE-2019-19728, CVE-2019-12838. * Disable i586 builds as this is no longer supported. * Create libnss_slurm package to support user and group resolution thru slurmstepd. * slurm-2.4.4-rpath.patch -> Remove-rpath-from-build.patch Obsoleted: - pam_slurm_adopt-avoid-running-outside-of-the-sshd-PA.patch - pam_slurm_adopt-send_user_msg-don-t-copy-undefined-d.patch - pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch OBS-URL: https://build.opensuse.org/request/show/762650 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=118
2020-01-10 11:38:48 +01:00
- LIBS => ["-L@top_builddir@/src/api/.libs -L@prefix@/lib -lslurm"], # e.g., '-lm'
Accepting request 163005 from home:scorot:branches:network:cluster Simple Linux Utility for Resource Management OBS-URL: https://build.opensuse.org/request/show/163005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=1
2013-04-08 23:59:36 +02:00
+ 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:
Copy Permalink