File gasnet_add_RPM_OPT_FLAGS.patch of Package gasnet
diff --git a/Makefile.am b/Makefile.am
index e3c153b..0c8258e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,7 @@
# Terms of use are as specified in license.txt
AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I other/plpa/config
-
+ACLOCAL_AMFLAGS = -I other/plpa/config
# Directories for automake to recurse into:
SUBDIRS = . \
config-aux \
diff --git a/ibv-conduit/Makefile.am b/ibv-conduit/Makefile.am
index c43dbc4..c27af83 100644
--- a/ibv-conduit/Makefile.am
+++ b/ibv-conduit/Makefile.am
@@ -96,7 +96,7 @@ CONDUIT_SOURCELIST = \
# additional -I or -D directives needed by this specific conduit
# other than the standard GASNet includes and flags
CONDUIT_EXTRALIBCFLAGS = -I@IBV_INCLUDE@ $(fh_extralibcflags) $(ssh_defines) $(mpi_defines) $(pmi_cppflags) $(fca_extralibcflags)\
- @IBV_LIBCFLAGS@ $(rcv_thread_defines)
+ @IBV_LIBCFLAGS@ $(rcv_thread_defines) $(RPM_OPT_FLAGS)
# additional conduit header files to install from external, non-standard directories
CONDUIT_EXTRAHEADERS = $(fh_extraheaders) $(fca_extraheaders)
diff --git a/other/Makefile-libgasnet.mak.in b/other/Makefile-libgasnet.mak.in
index 307de47..3b6e1b7 100644
--- a/other/Makefile-libgasnet.mak.in
+++ b/other/Makefile-libgasnet.mak.in
@@ -42,6 +42,7 @@ TOOLLIBCFLAGS = \
-DGASNETT_BUILDING_TOOLS \
@CFLAGS@ \
@MISC_CFLAGS@ \
+ $(RPM_OPT_FLAGS) \
$(TOOLLIBDEFINES) \
$(TOOLLIB_DEBUGFLAGS) \
$(TOOLLIBINCLUDES) \
@@ -50,6 +51,7 @@ TOOLLIBCFLAGS = \
LIBCFLAGS = \
@CFLAGS@ \
+ $(RPM_OPT_FLAGS) \
@MISC_CFLAGS@ \
$(LIBDEFINES) \
$(CONDUIT_EXTRALIBCFLAGS) \
diff --git a/other/amudp/Makefile.am b/other/amudp/Makefile.am
index 48b98d6..10f01bc 100644
--- a/other/amudp/Makefile.am
+++ b/other/amudp/Makefile.am
@@ -27,9 +27,9 @@ else
endif
CC = @CC@
-CFLAGS = @CFLAGS@ @MISC_CFLAGS@ @SYS_HEADER_BLD@ $(MANUAL_CFLAGS) $(apputils_flags) $(strict_proto_flags)
+CFLAGS = @CFLAGS@ @MISC_CFLAGS@ @SYS_HEADER_BLD@ $(MANUAL_CFLAGS) $(apputils_flags) $(strict_proto_flags) $(RPM_OPT_FLAGS)
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @MISC_CXXFLAGS@ @SYS_HEADER_BLD@ $(MANUAL_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ @MISC_CXXFLAGS@ @SYS_HEADER_BLD@ $(MANUAL_CXXFLAGS) $(RPM_OPT_FLAGS)
LDFLAGS = @LDFLAGS@ @cxxLDFLAGS@ $(MANUAL_LDFLAGS)
PERL = @PERL@
diff --git a/psm-conduit/Makefile.am b/psm-conduit/Makefile.am
index 2489c13..51bd3db 100644
--- a/psm-conduit/Makefile.am
+++ b/psm-conduit/Makefile.am
@@ -74,7 +74,7 @@ CONDUIT_SOURCELIST = \
# additional -I or -D directives needed by this specific conduit
# other than the standard GASNet includes and flags
-CONDUIT_EXTRALIBCFLAGS = @PSM_INCLUDE@ $(ssh_defines) $(mpi_defines) $(pmi_cppflags)
+CONDUIT_EXTRALIBCFLAGS = @PSM_INCLUDE@ $(ssh_defines) $(mpi_defines) $(pmi_cppflags) $(RPM_OPT_FLAGS)
# additional conduit header files to install from external, non-standard directories
CONDUIT_EXTRAHEADERS =
diff --git a/smp-conduit/Makefile.am b/smp-conduit/Makefile.am
index 4a2f496..5891557 100644
--- a/smp-conduit/Makefile.am
+++ b/smp-conduit/Makefile.am
@@ -35,7 +35,7 @@ CONDUIT_SOURCELIST = \
# additional -I or -D directives needed by this specific conduit
# other than the standard GASNet includes and flags
-CONDUIT_EXTRALIBCFLAGS =
+CONDUIT_EXTRALIBCFLAGS = $(RPM_OPT_FLAGS)
# additional conduit header files to install from external, non-standard directories
CONDUIT_EXTRAHEADERS =
diff --git a/udp-conduit/Makefile.am b/udp-conduit/Makefile.am
index c3ff668..8faabdf 100644
--- a/udp-conduit/Makefile.am
+++ b/udp-conduit/Makefile.am
@@ -29,7 +29,7 @@ CONDUIT_SOURCELIST = \
# additional -I or -D directives needed by this specific conduit
# other than the standard GASNet includes and flags
-CONDUIT_EXTRALIBCFLAGS = -I$(top_srcdir)/other/amudp
+CONDUIT_EXTRALIBCFLAGS = -I$(top_srcdir)/other/amudp $(RPM_OPT_FLAGS)
# additional conduit header files to install from external, non-standard directories
CONDUIT_EXTRAHEADERS = \