Package: slurm-llnl Version: 2.3.3-2 Severity: important Tags: patch Dear Maintainer,
The hardening flags are partially missing because the build
system ignores them in some places. For more hardening
information please have a look at [1], [2] and [3].
The attached patch fixes the issue, but I'm not sure if the *FLAG
-> AM_*FLAG change is the best way to handle this. Other
Makefile.am handle it this way and it results in the correct
flags, but maybe there is a better way. If possible this patch
should be send to upstream (*.am only).
To check if all flags were correctly enabled you can use
`hardening-check` from the hardening-includes package and check
the build log (hardening-check doesn't catch everything):
$ hardening-check /usr/sbin/slurmstepd /usr/sbin/slurmd /usr/sbin/slurmctld
...
/usr/sbin/slurmstepd:
Position Independent Executable: no, normal executable!
Stack protected: yes
Fortify Source functions: yes (some protected functions found)
Read-only relocations: yes
Immediate binding: no not found!
/usr/sbin/slurmd:
Position Independent Executable: no, normal executable!
Stack protected: yes
Fortify Source functions: yes (some protected functions found)
Read-only relocations: yes
Immediate binding: no not found!
/usr/sbin/slurmctld:
Position Independent Executable: no, normal executable!
Stack protected: yes
Fortify Source functions: yes (some protected functions found)
Read-only relocations: yes
Immediate binding: no not found!
...
(Position Independent Executable and Immediate binding is not
enabled by default.)
Use find -type f \( -executable -o -name \*.so\* \) -exec
hardening-check {} + on the build result to check all files.
Regards,
Simon
[1]: https://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags
[2]: https://wiki.debian.org/HardeningWalkthrough
[3]: https://wiki.debian.org/Hardening
--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9
Description: Use build flags from environment (dpkg-buildflags).
Necessary for hardening flags.
Author: Simon Ruderich <si...@ruderich.org>
Last-Update: 2012-03-14
Index: slurm-llnl-2.3.3/contribs/perlapi/libslurmdb/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/perlapi/libslurmdb/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/perlapi/libslurmdb/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -502,15 +502,15 @@
@HAVE_AIX_TRUE@ if [ ! -f Makefile ]; then \
@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@ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+@HAVE_AIX_TRUE@ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(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= 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)) && \
+@HAVE_AIX_FALSE@ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+@HAVE_AIX_FALSE@ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
@HAVE_AIX_FALSE@ cd ..;
install-exec-local:
Index: slurm-llnl-2.3.3/contribs/perlapi/libslurmdb/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/perlapi/libslurmdb/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/perlapi/libslurmdb/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -34,16 +34,16 @@
if [ ! -f Makefile ]; then \
$(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)) && \
+ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..;
else
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(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)) && \
+ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..;
endif
Index: slurm-llnl-2.3.3/src/common/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/common/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/common/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -227,7 +227,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DGRES_CONFIG_FILE=\"$(sysconfdir)/gres.conf\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DGRES_CONFIG_FILE=\"$(sysconfdir)/gres.conf\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/common/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/common/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/common/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -8,7 +8,7 @@
# only be 1 address per symbol. If you link to the libcommon.la in
# a plugin you will get 2 addresses for one symbol which could lead to problems.
-CPPFLAGS = -DGRES_CONFIG_FILE=\"$(sysconfdir)/gres.conf\"
+AM_CPPFLAGS = -DGRES_CONFIG_FILE=\"$(sysconfdir)/gres.conf\"
AUTOMAKE_OPTIONS = foreign
if HAVE_UNSETENV
Index: slurm-llnl-2.3.3/contribs/pam/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/pam/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/pam/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -161,7 +161,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -fPIC
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -fPIC
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/contribs/pam/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/pam/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/pam/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign
-CPPFLAGS = -fPIC
+AM_CPPFLAGS = -fPIC
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
PLUGIN_FLAGS = -module --export-dynamic -avoid-version
Index: slurm-llnl-2.3.3/contribs/phpext/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/phpext/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/phpext/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -283,8 +283,8 @@
AUTOMAKE_OPTIONS = foreign
php_dir = slurm_php
phpize = /usr/bin/phpize
-@HAVE_AIX_FALSE@config_line = CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="-g -static $(CFLAGS)" CFLAGS="$(CFLAGS)" ./configure
-@HAVE_AIX_TRUE@config_line = CC="$(CC)" CCFLAGS="-g -static $(CFLAGS)" ./configure
+@HAVE_AIX_FALSE@config_line = CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="-g -static $(CFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" ./configure
+@HAVE_AIX_TRUE@config_line = CC="$(CC)" CCFLAGS="-g -static $(CFLAGS) $(CPPFLAGS)" ./configure
all: all-am
.SUFFIXES:
Index: slurm-llnl-2.3.3/contribs/phpext/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/phpext/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/phpext/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -3,9 +3,9 @@
phpize=/usr/bin/phpize
if HAVE_AIX
-config_line=CC="$(CC)" CCFLAGS="-g -static $(CFLAGS)" ./configure
+config_line=CC="$(CC)" CCFLAGS="-g -static $(CFLAGS) $(CPPFLAGS)" ./configure
else
-config_line=CC="$(CC)" LD="$(CC) $(CFLAGS)" CCFLAGS="-g -static $(CFLAGS)" CFLAGS="$(CFLAGS)" ./configure
+config_line=CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="-g -static $(CFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" ./configure
endif
all-local:
Index: slurm-llnl-2.3.3/src/slurmd/slurmd/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/slurmd/slurmd/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/slurmd/slurmd/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -139,7 +139,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/slurmd/slurmd/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/slurmd/slurmd/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/slurmd/slurmd/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -5,7 +5,7 @@
sbin_PROGRAMS = slurmd
-CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\"
+AM_CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\"
INCLUDES = -I$(top_srcdir)
slurmd_LDADD = \
Index: slurm-llnl-2.3.3/src/plugins/switch/federation/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/switch/federation/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/switch/federation/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -163,7 +163,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/plugins/switch/federation/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/switch/federation/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/switch/federation/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -1,6 +1,6 @@
# Makefile for switch/federation plugin
-CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
+AM_CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
AUTOMAKE_OPTIONS = foreign
if HAVE_FEDERATION
Index: slurm-llnl-2.3.3/src/plugins/topology/tree/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/topology/tree/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/topology/tree/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -154,7 +154,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DTOPOLOGY_CONFIG_FILE=\"$(sysconfdir)/topology.conf\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DTOPOLOGY_CONFIG_FILE=\"$(sysconfdir)/topology.conf\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/plugins/topology/tree/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/topology/tree/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/topology/tree/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -1,6 +1,6 @@
# Makefile for topology/tree plugin
-CPPFLAGS = -DTOPOLOGY_CONFIG_FILE=\"$(sysconfdir)/topology.conf\"
+AM_CPPFLAGS = -DTOPOLOGY_CONFIG_FILE=\"$(sysconfdir)/topology.conf\"
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/select/cray/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/select/cray/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/select/cray/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -201,7 +201,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DCRAY_CONFIG_FILE=\"$(sysconfdir)/cray.conf\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DCRAY_CONFIG_FILE=\"$(sysconfdir)/cray.conf\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/plugins/select/cray/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/select/cray/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/select/cray/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CPPFLAGS = -DCRAY_CONFIG_FILE=\"$(sysconfdir)/cray.conf\"
+AM_CPPFLAGS = -DCRAY_CONFIG_FILE=\"$(sysconfdir)/cray.conf\"
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/select/bluegene/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/select/bluegene/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/select/bluegene/Makefile.in 2012-03-14 18:41:37.924853185 +0100
@@ -296,7 +296,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = -DBLUEGENE_CONFIG_FILE=\"$(sysconfdir)/bluegene.conf\"
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = -DBLUEGENE_CONFIG_FILE=\"$(sysconfdir)/bluegene.conf\"
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/plugins/select/bluegene/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/select/bluegene/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/select/bluegene/Makefile.am 2012-03-14 18:41:37.924853185 +0100
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = foreign
CLEANFILES = core.*
-CPPFLAGS = -DBLUEGENE_CONFIG_FILE=\"$(sysconfdir)/bluegene.conf\"
+AM_CPPFLAGS = -DBLUEGENE_CONFIG_FILE=\"$(sysconfdir)/bluegene.conf\"
PLUGIN_FLAGS = -module -avoid-version --export-dynamic -lm
Index: slurm-llnl-2.3.3/src/plugins/jobcomp/pgsql/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/jobcomp/pgsql/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/jobcomp/pgsql/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -163,7 +163,8 @@
CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
-CPPFLAGS = $(PGSQL_CFLAGS)
+CPPFLAGS = @CPPFLAGS@
+AM_CPPFLAGS = $(PGSQL_CFLAGS)
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
Index: slurm-llnl-2.3.3/src/plugins/jobcomp/pgsql/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/jobcomp/pgsql/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/jobcomp/pgsql/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -1,6 +1,6 @@
# Makefile for jobcomp/pgsql plugin
-CPPFLAGS = $(PGSQL_CFLAGS)
+AM_CPPFLAGS = $(PGSQL_CFLAGS)
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/sched/backfill/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/backfill/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/backfill/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -158,7 +158,8 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -fexceptions
+CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = -fexceptions
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
Index: slurm-llnl-2.3.3/src/plugins/sched/backfill/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/backfill/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/backfill/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CXXFLAGS = -fexceptions
+AM_CXXFLAGS = -fexceptions
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/sched/wiki/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/wiki/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/wiki/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -160,7 +160,8 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -fexceptions
+CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = -fexceptions
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
Index: slurm-llnl-2.3.3/src/plugins/sched/wiki/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/wiki/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/wiki/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CXXFLAGS = -fexceptions
+AM_CXXFLAGS = -fexceptions
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/sched/wiki2/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/wiki2/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/wiki2/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -163,7 +163,8 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -fexceptions
+CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = -fexceptions
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
Index: slurm-llnl-2.3.3/src/plugins/sched/wiki2/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/wiki2/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/wiki2/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CXXFLAGS = -fexceptions
+AM_CXXFLAGS = -fexceptions
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/sched/hold/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/hold/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/hold/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -158,7 +158,8 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -fexceptions
+CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = -fexceptions
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
Index: slurm-llnl-2.3.3/src/plugins/sched/hold/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/hold/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/hold/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CXXFLAGS = -fexceptions
+AM_CXXFLAGS = -fexceptions
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/src/plugins/sched/builtin/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/builtin/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/builtin/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -158,7 +158,8 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -fexceptions
+CXXFLAGS = @CXXFLAGS@
+AM_CXXFLAGS = -fexceptions
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
Index: slurm-llnl-2.3.3/src/plugins/sched/builtin/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/src/plugins/sched/builtin/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/src/plugins/sched/builtin/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign
-CXXFLAGS = -fexceptions
+AM_CXXFLAGS = -fexceptions
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
Index: slurm-llnl-2.3.3/contribs/perlapi/libslurm/Makefile.in
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/perlapi/libslurm/Makefile.in 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/perlapi/libslurm/Makefile.in 2012-03-14 18:41:37.928853236 +0100
@@ -552,15 +552,15 @@
@HAVE_AIX_TRUE@ if [ ! -f Makefile ]; then \
@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@ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+@HAVE_AIX_TRUE@ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(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= 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)) && \
+@HAVE_AIX_FALSE@ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+@HAVE_AIX_FALSE@ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
@HAVE_AIX_FALSE@ cd ..;
install-exec-local:
Index: slurm-llnl-2.3.3/contribs/perlapi/libslurm/Makefile.am
===================================================================
--- slurm-llnl-2.3.3.orig/contribs/perlapi/libslurm/Makefile.am 2012-03-14 18:41:33.112853221 +0100
+++ slurm-llnl-2.3.3/contribs/perlapi/libslurm/Makefile.am 2012-03-14 18:41:37.928853236 +0100
@@ -84,16 +84,16 @@
if [ ! -f Makefile ]; then \
$(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)) && \
+ ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..;
else
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(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)) && \
+ ($(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="$(CC)" LD="$(CC) $(CFLAGS) $(LDFLAGS)" CCFLAGS="$(PERL_CFLAGS) -g -static $(CFLAGS) $(CPPFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..;
endif
signature.asc
Description: Digital signature
