Skip to content
Snippets Groups Projects
Commit fda68331 authored by Danny Auble's avatar Danny Auble
Browse files

svn merge -r 22723:22727 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

parents 4ca3fc58 e5db4899
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NEWS
+ 2
− 0
View file @ fda68331
......@@ -107,6 +107,8 @@ documents those changes that are of interest to users and admins.
be reserved and are consumed by jobs. This reservation mechanism for less
than an entire midplane is still under development.
-- Clear a job's "reason" field when a hold job is released.
-- Fix for sview started on a non-bluegene system to pick colors correctly
when talking to a real bluegene system.
* Changes in SLURM 2.2.3
========================
......
contribs/perlapi/libslurm/Makefile.am
+ 5
− 4
View file @ fda68331
......@@ -65,12 +65,13 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \
fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE=
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=
#
# Note on linking logic below
#
# Install at PREFIX and ignore INSTALL_BASE. Having both results in a build error.
# Install at PREFIX and ignore both INSTALL_BASE and PERL_MM_OPT. Having both
# more than one installation location specification results in a build error.
# AIX needs to use LD to link. It can not use gcc.
# Suse Linux compiles with gcc, but picks some other compiler to use for linking.
# Since some CFLAGS may be incompatible with this other compiler, the build
......@@ -81,7 +82,7 @@ all-local: $(perl_dir)/Makefile #libslurm
if HAVE_AIX
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT= ; \
fi && \
($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......@@ -89,7 +90,7 @@ if HAVE_AIX
else
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT= ; \
fi && \
($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
$(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......
contribs/perlapi/libslurm/Makefile.in
+ 5
− 4
View file @ fda68331
......@@ -529,12 +529,13 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \
fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE=
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=
#
# Note on linking logic below
#
# Install at PREFIX and ignore INSTALL_BASE. Having both results in a build error.
# Install at PREFIX and ignore both INSTALL_BASE and PERL_MM_OPT. Having both
# more than one installation location specification results in a build error.
# AIX needs to use LD to link. It can not use gcc.
# Suse Linux compiles with gcc, but picks some other compiler to use for linking.
# Since some CFLAGS may be incompatible with this other compiler, the build
......@@ -544,14 +545,14 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
all-local: $(perl_dir)/Makefile #libslurm
@HAVE_AIX_TRUE@ @cd $(perl_dir) && \
@HAVE_AIX_TRUE@ if [ ! -f Makefile ]; then \
@HAVE_AIX_TRUE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
@HAVE_AIX_TRUE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT= ; \
@HAVE_AIX_TRUE@ fi && \
@HAVE_AIX_TRUE@ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
@HAVE_AIX_TRUE@ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
@HAVE_AIX_TRUE@ cd ..;
@HAVE_AIX_FALSE@ @cd $(perl_dir) && \
@HAVE_AIX_FALSE@ if [ ! -f Makefile ]; then \
@HAVE_AIX_FALSE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
@HAVE_AIX_FALSE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT= ; \
@HAVE_AIX_FALSE@ fi && \
@HAVE_AIX_FALSE@ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
@HAVE_AIX_FALSE@ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......
contribs/perlapi/libslurmdb/Makefile.am
+ 3
− 3
View file @ fda68331
......@@ -17,7 +17,7 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \
fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=
#
# Note on linking logic below
......@@ -32,7 +32,7 @@ all-local: $(perl_dir)/Makefile #libslurmdb
if HAVE_AIX
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=; \
fi && \
($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......@@ -40,7 +40,7 @@ if HAVE_AIX
else
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=; \
fi && \
($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
$(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......
contribs/perlapi/libslurmdb/Makefile.in
+ 3
− 3
View file @ fda68331
......@@ -481,7 +481,7 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \
fi
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}
@cd $(perl_dir) && $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=
#
# Note on linking logic below
......@@ -495,14 +495,14 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
all-local: $(perl_dir)/Makefile #libslurmdb
@HAVE_AIX_TRUE@ @cd $(perl_dir) && \
@HAVE_AIX_TRUE@ if [ ! -f Makefile ]; then \
@HAVE_AIX_TRUE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \
@HAVE_AIX_TRUE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=; \
@HAVE_AIX_TRUE@ fi && \
@HAVE_AIX_TRUE@ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
@HAVE_AIX_TRUE@ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
@HAVE_AIX_TRUE@ cd ..;
@HAVE_AIX_FALSE@ @cd $(perl_dir) && \
@HAVE_AIX_FALSE@ if [ ! -f Makefile ]; then \
@HAVE_AIX_FALSE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \
@HAVE_AIX_FALSE@ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=; \
@HAVE_AIX_FALSE@ fi && \
@HAVE_AIX_FALSE@ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
@HAVE_AIX_FALSE@ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
......
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung