debian/patches/mk-sort-headers-before-wildcard-inclusion.patch

   1 Description: mk: sort headers before wildcard inclusion
   2
   3 In order to achieve fully reproducible builds, always use the same
   4 inclusion order for headers in the Makefiles.
   5
   6 Origin: http://dpdk.org/dev/patchwork/patch/25677/
   7 Forwarded: yes
   8 Author: Luca Boccassi <luca.boccassi@gmail.com>
   9 Last-Update: 2017-06-24
  10 ---
  11  examples/ip_pipeline/Makefile                              | 2 +-
  12  examples/multi_process/client_server_mp/mp_server/Makefile | 2 +-
  13  examples/server_node_efd/server/Makefile                   | 2 +-
  14  lib/librte_eal/common/Makefile                             | 2 +-
  15  4 files changed, 4 insertions(+), 4 deletions(-)
  16
  17 diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile
  18 index dc7e0ddd7..12ce0a1d5 100644
  19 --- a/examples/ip_pipeline/Makefile
  20 +++ b/examples/ip_pipeline/Makefile
  21 @@ -43,7 +43,7 @@ APP = ip_pipeline
  22
  23  VPATH += $(SRCDIR)/pipeline
  24
  25 -INC += $(wildcard *.h) $(wildcard pipeline/*.h)
  26 +INC += $(sort $(wildcard *.h)) $(sort $(wildcard pipeline/*.h))
  27
  28  # all source are stored in SRCS-y
  29  SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := main.c
  30 diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile
  31 index 5552999b5..160c17b68 100644
  32 --- a/examples/multi_process/client_server_mp/mp_server/Makefile
  33 +++ b/examples/multi_process/client_server_mp/mp_server/Makefile
  34 @@ -49,7 +49,7 @@ APP = mp_server
  35  # all source are stored in SRCS-y
  36  SRCS-y := main.c init.c args.c
  37
  38 -INC := $(wildcard *.h)
  39 +INC := $(sort $(wildcard *.h))
  40
  41  CFLAGS += $(WERROR_FLAGS) -O3
  42  CFLAGS += -I$(SRCDIR)/../shared
  43 diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile
  44 index a2f2f361b..9f1fe2894 100644
  45 --- a/examples/server_node_efd/server/Makefile
  46 +++ b/examples/server_node_efd/server/Makefile
  47 @@ -49,7 +49,7 @@ APP = server
  48  # all source are stored in SRCS-y
  49  SRCS-y := main.c init.c args.c
  50
  51 -INC := $(wildcard *.h)
  52 +INC := $(sort $(wildcard *.h))
  53
  54  CFLAGS += $(WERROR_FLAGS) -O3
  55  CFLAGS += -I$(SRCDIR)/../shared
  56 diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
  57 index a5bd1089a..4b712600a 100644
  58 --- a/lib/librte_eal/common/Makefile
  59 +++ b/lib/librte_eal/common/Makefile
  60 @@ -48,7 +48,7 @@ GENERIC_INC += rte_vect.h rte_io.h
  61
  62  # defined in mk/arch/$(RTE_ARCH)/rte.vars.mk
  63  ARCH_DIR ?= $(RTE_ARCH)
  64 -ARCH_INC := $(notdir $(wildcard $(RTE_SDK)/lib/librte_eal/common/include/arch/$(ARCH_DIR)/*.h))
  65 +ARCH_INC := $(sort $(notdir $(wildcard $(RTE_SDK)/lib/librte_eal/common/include/arch/$(ARCH_DIR)/*.h)))
  66
  67  SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := $(addprefix include/,$(INC))
  68  SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \
  69 --
  70 2.11.0
  71
  72