Skip to content
Snippets Groups Projects
Commit 95a7d376 authored by Moe Jette's avatar Moe Jette
Browse files

When building contribs/perlapi ignore INSTALL_BASE and use PREFIX instead.

    Perl can not build if both are set.
parent e520268b
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,8 @@ documents those changes that are of interest to users and admins. ...@@ -11,6 +11,8 @@ documents those changes that are of interest to users and admins.
was job would be requeued. (happens very rarely) was job would be requeued. (happens very rarely)
-- In accounting_storage/filetxt plugin, substitute spaces within job names, -- In accounting_storage/filetxt plugin, substitute spaces within job names,
step names, and account names with an underscore to insure proper parsing. step names, and account names with an underscore to insure proper parsing.
-- When building contribs/perlapi ignore INSTALL_BASE and use PREFIX instead.
Perl can not build if both are set.
* Changes in SLURM 2.2.3 * Changes in SLURM 2.2.3
======================== ========================
......
...@@ -65,11 +65,12 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL ...@@ -65,11 +65,12 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \ ${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \ done; \
fi 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=
# #
# Note on linking logic below # Note on linking logic below
# #
# Install at PREFIX and ignore INSTALL_BASE. Having both results in a build error.
# AIX needs to use LD to link. It can not use gcc. # 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. # 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 # Since some CFLAGS may be incompatible with this other compiler, the build
...@@ -80,7 +81,7 @@ all-local: $(perl_dir)/Makefile #libslurm ...@@ -80,7 +81,7 @@ all-local: $(perl_dir)/Makefile #libslurm
if HAVE_AIX if HAVE_AIX
@cd $(perl_dir) && \ @cd $(perl_dir) && \
if [ ! -f Makefile ]; then \ if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
fi && \ 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) || \
$(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
...@@ -88,7 +89,7 @@ if HAVE_AIX ...@@ -88,7 +89,7 @@ if HAVE_AIX
else else
@cd $(perl_dir) && \ @cd $(perl_dir) && \
if [ ! -f Makefile ]; then \ if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix}; \ $(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= ; \
fi && \ 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) || \
$(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)) && \
......
...@@ -526,11 +526,12 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL ...@@ -526,11 +526,12 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
${LN_S} -f ${abs_srcdir}/$$f $$f; \ ${LN_S} -f ${abs_srcdir}/$$f $$f; \
done; \ done; \
fi 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=
# #
# Note on linking logic below # Note on linking logic below
# #
# Install at PREFIX and ignore INSTALL_BASE. Having both results in a build error.
# AIX needs to use LD to link. It can not use gcc. # 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. # 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 # Since some CFLAGS may be incompatible with this other compiler, the build
...@@ -540,14 +541,14 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL ...@@ -540,14 +541,14 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
all-local: $(perl_dir)/Makefile #libslurm all-local: $(perl_dir)/Makefile #libslurm
@HAVE_AIX_TRUE@ @cd $(perl_dir) && \ @HAVE_AIX_TRUE@ @cd $(perl_dir) && \
@HAVE_AIX_TRUE@ if [ ! -f Makefile ]; then \ @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= ; \
@HAVE_AIX_TRUE@ fi && \ @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@ $(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_TRUE@ cd ..;
@HAVE_AIX_FALSE@ @cd $(perl_dir) && \ @HAVE_AIX_FALSE@ @cd $(perl_dir) && \
@HAVE_AIX_FALSE@ if [ ! -f Makefile ]; then \ @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= ; \
@HAVE_AIX_FALSE@ fi && \ @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) || \
@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% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment