package/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch

   1 From 85a3e5b4f65e5284e59dcdd90e92ea7d50ef6907 Mon Sep 17 00:00:00 2001
   2 From: Romain Naour <romain.naour@openwide.fr>
   3 Date: Sun, 8 Feb 2015 17:23:13 +0100
   4 Subject: [PATCH] erts/emulator: reorder inclued headers paths
   5
   6 If the Perl Compatible Regular Expressions is installed on the
   7 host and the path to the headers is added to the CFLAGS, the
   8 pcre.h from the host is used instead of the one provided by
   9 erlang.
  10
  11 Erlang use an old version of this file which is incompatible
  12 with the upstream one.
  13
  14 Move INCLUDES before CFLAGS to use pcre.h from erlang.
  15
  16 http://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log
  17
  18 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
  19 ---
  20  erts/emulator/Makefile.in | 4 ++--
  21  1 file changed, 2 insertions(+), 2 deletions(-)
  22
  23 diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
  24 index 7145824..d079487 100644
  25 --- a/erts/emulator/Makefile.in
  26 +++ b/erts/emulator/Makefile.in
  27 @@ -678,11 +678,11 @@ else
  28  # Usually the same as the default rule, but certain platforms (e.g. win32) mix
  29  # different compilers
  30  $(OBJDIR)/beam_emu.o: beam/beam_emu.c
  31 -       $(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
  32 +       $(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
  33  endif
  34
  35  $(OBJDIR)/%.o: beam/%.c
  36 -       $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
  37 +       $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
  38
  39  $(OBJDIR)/%.o: $(TARGET)/%.c
  40         $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@
  41 --
  42 1.9.3
  43