icedtea-web/trunk/compiler-flags.patch

   1 --- Makefile.am 2019-09-16 15:31:52.584052355 +0200
   2 +++ Makefile.am 2019-09-16 17:06:33.643083502 +0200
   3 @@ -593,7 +593,7 @@
   4  $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
   5         mkdir -p $(PLUGIN_DIR) && \
   6         cd $(PLUGIN_DIR) && \
   7 -       $(CXX) $(CXXFLAGS) \
   8 +       $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
   9            $(DEFS) $(VERSION_DEFS) \
  10           -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
  11           -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
  12 @@ -614,10 +614,11 @@
  13
  14  $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
  15         cd $(PLUGIN_DIR) && \
  16 -       $(CXX) $(CXXFLAGS) \
  17 +       $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
  18           $(PLUGIN_OBJECTS) \
  19           $(GLIB_LIBS) \
  20           $(MOZILLA_LIBS) \
  21 +         $(LDFLAGS) \
  22           -shared -o $@
  23
  24  # Start of CPP Unit test targets
  25 @@ -629,7 +630,7 @@
  26         for cppfile in $$(find $(CPP_UNITTEST_FRAMEWORK_SRCDIR) -name '*.cpp') ; \
  27         do \
  28           objfile="$(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/$$(basename $${cppfile%.cpp}).o" ; \
  29 -         $(CXX) $(CXXFLAGS) -c $$cppfile -o $$objfile || exit 1 ; \
  30 +         $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $$cppfile -o $$objfile || exit 1 ; \
  31         done ; \
  32         ar cr $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o ; \
  33         popd
  34 @@ -648,7 +649,7 @@
  35         do \
  36         objfile="$(CPP_UNITTEST_DIR)/$$(basename $${cppfile%.cc}).o" ; \
  37         echo "Compiling $$cppfile to $$objfile"; \
  38 -       $(CXX) $(CXXFLAGS) \
  39 +       $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
  40            $(DEFS) $(VERSION_DEFS) \
  41           -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
  42           -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
  43 @@ -674,7 +675,7 @@
  44
  45  $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp
  46         cd $(CPP_UNITTEST_DIR) && \
  47 -       $(CXX) $(CXXFLAGS) \
  48 +         $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) \
  49           $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \
  50           $(CPP_UNITTEST_DIR)/*.o \
  51           -lrt \
  52 @@ -1753,7 +1754,7 @@
  53
  54  $(COVERABLE_PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
  55         cd $(COVERABLE_PLUGIN_DIR) && \
  56 -       $(CXX) $(CXXFLAGS) \
  57 +       $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
  58            $(DEFS) $(VERSION_DEFS) \
  59           -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
  60           -DPLUGIN_NAME="\"IcedTea-Web Plugin with jacoco coverage agent\"" \
  61 @@ -1775,7 +1776,7 @@
  62
  63  $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
  64         cd $(COVERABLE_PLUGIN_DIR) && \
  65 -       $(CXX) $(CXXFLAGS) \
  66 +       $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) \
  67           $(PLUGIN_OBJECTS) \
  68           $(GLIB_LIBS) \
  69           $(MOZILLA_LIBS) \