diff options
Diffstat (limited to 'debian/patches/mk-sort-headers-before-wildcard-inclusion.patch')
-rw-r--r-- | debian/patches/mk-sort-headers-before-wildcard-inclusion.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/debian/patches/mk-sort-headers-before-wildcard-inclusion.patch b/debian/patches/mk-sort-headers-before-wildcard-inclusion.patch new file mode 100644 index 00000000..332a88e7 --- /dev/null +++ b/debian/patches/mk-sort-headers-before-wildcard-inclusion.patch @@ -0,0 +1,72 @@ +Description: mk: sort headers before wildcard inclusion + +In order to achieve fully reproducible builds, always use the same +inclusion order for headers in the Makefiles. + +Origin: http://dpdk.org/dev/patchwork/patch/27509/ +Forwarded: yes +Author: Luca Boccassi <luca.boccassi@gmail.com> +Last-Update: 2017-08-10 +--- + examples/ip_pipeline/Makefile | 2 +- + examples/multi_process/client_server_mp/mp_server/Makefile | 2 +- + examples/server_node_efd/server/Makefile | 2 +- + lib/librte_eal/common/Makefile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile +index dc7e0ddd7..12ce0a1d5 100644 +--- a/examples/ip_pipeline/Makefile ++++ b/examples/ip_pipeline/Makefile +@@ -43,7 +43,7 @@ APP = ip_pipeline + + VPATH += $(SRCDIR)/pipeline + +-INC += $(wildcard *.h) $(wildcard pipeline/*.h) ++INC += $(sort $(wildcard *.h)) $(sort $(wildcard pipeline/*.h)) + + # all source are stored in SRCS-y + SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := main.c +diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile +index 5552999b5..160c17b68 100644 +--- a/examples/multi_process/client_server_mp/mp_server/Makefile ++++ b/examples/multi_process/client_server_mp/mp_server/Makefile +@@ -49,7 +49,7 @@ APP = mp_server + # all source are stored in SRCS-y + SRCS-y := main.c init.c args.c + +-INC := $(wildcard *.h) ++INC := $(sort $(wildcard *.h)) + + CFLAGS += $(WERROR_FLAGS) -O3 + CFLAGS += -I$(SRCDIR)/../shared +diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile +index a2f2f361b..9f1fe2894 100644 +--- a/examples/server_node_efd/server/Makefile ++++ b/examples/server_node_efd/server/Makefile +@@ -49,7 +49,7 @@ APP = server + # all source are stored in SRCS-y + SRCS-y := main.c init.c args.c + +-INC := $(wildcard *.h) ++INC := $(sort $(wildcard *.h)) + + CFLAGS += $(WERROR_FLAGS) -O3 + CFLAGS += -I$(SRCDIR)/../shared +diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile +index a5bd1089a..4b712600a 100644 +--- a/lib/librte_eal/common/Makefile ++++ b/lib/librte_eal/common/Makefile +@@ -48,7 +48,7 @@ GENERIC_INC += rte_vect.h rte_io.h + + # defined in mk/arch/$(RTE_ARCH)/rte.vars.mk + ARCH_DIR ?= $(RTE_ARCH) +-ARCH_INC := $(notdir $(wildcard $(RTE_SDK)/lib/librte_eal/common/include/arch/$(ARCH_DIR)/*.h)) ++ARCH_INC := $(sort $(notdir $(wildcard $(RTE_SDK)/lib/librte_eal/common/include/arch/$(ARCH_DIR)/*.h))) + + SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := $(addprefix include/,$(INC)) + SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \ +-- +2.11.0 + + |