Mercurial > hg > octave-nkf

changeset 19152:a5add7b660ac stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix compiling GUI on Alpha platforms (bug #42839). * libgui/Makefile.am: Use GNU Makefile filter-out command to remove -mieee CFLAG option from CPPFLAGS passed to MOC command.
author Rik <rik@octave.org>
date Sat, 26 Jul 2014 07:50:38 -0700
parents 87cba451fd5e
children 625e3bb65885
files libgui/Makefile.am
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/Makefile.am
+++ b/libgui/Makefile.am
@@ -22,6 +22,10 @@
 
 MOC_CPPFLAGS =
 
+## Fix for bug #42839 where -mieee CFLAG option is added to CPPFLAGS by gnulib.
+## Eventually gnulib will be appropriately fixed and this hack removed.
+MOC_OCTAVE_CPPFLAGS = $(filter-out -mieee, $(AM_CPPFLAGS) $(CPPFLAGS))
+
 octlib_LTLIBRARIES = liboctgui.la
 
 TRANSLATIONS = \
@@ -91,7 +95,7 @@
 ( echo '#ifdef HAVE_CONFIG_H'; \
   echo '#include <config.h>'; \
   echo '#endif'; \
-  $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t
+  $(MOC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< ) > $@-t
 mv $@-t $@
 endef