From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 90DCC47CE for ; Thu, 10 Aug 2017 20:24:35 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id d40so3951424wma.3 for ; Thu, 10 Aug 2017 11:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/G3Jstfb9a0lDW1HgJhrh4hmp5SEB7aL7a7c6CX1rfM=; b=dr5tfQOxFDYoiExsYQN8dWd71zodc536E1IvXkAwrwR61rn6GyTijj4G9EHxijlDfv ryfReWi39ODT3Mk27oLRZTSS1f7LfEGK+K8B3K9S5Nd7OERj2uIbMKDnXXgtjte1YB0I BiQGPTCXsUlXhQMDNshL2EAP8bHm/8AGBGSlm8IQDf3JeRvK68lYt4Mtu1uv6RrY77Pb QbZ4Uz1MNTzJeOqPtxWevuc/vsguDu1YDq8PS/+lM8BdgUxdZ5B/mXdRL5Pu7PiMrNdB HfrKeOVkrf90R1S09P7tXgM7AF1h+/vQnBQ7oUNcqBAESuKC1yGNCe4BY2FTpSscpD6X JmZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/G3Jstfb9a0lDW1HgJhrh4hmp5SEB7aL7a7c6CX1rfM=; b=uL57BShzgwli/LL2y/PD3TqY8ZL0HYCJzLiUPiiQZ8wmyx2iuAiQbRikeQdjOsEKty 5/zJoVt+AmNVCRkwddPqVfpvvojZidTqiEVDNFkeLLG3sICjF/Lx6pe8B67emgYmIQ9j T4yZzo/gc10wyZk1K14S212ek2t6vBBhaPPLeIDaYADFkNeQsVr+KizfaHntJCnxFlE0 vNIQDrm22zOGXDM9QGMUzzh2+rCd9KqGZBZVO6hW51a+5LQu6rImh2moB1EBoL0Ap+Iz AUZo+t5W3I0H3ngIAcAvpUJk0mwo7oQk9X2VFqTYGmEiZDU98ROxHtU+ucwxSXcANG9C BRCg== X-Gm-Message-State: AHYfb5j/SvlX6o2DuJoa6DGv3+A/GQW/hnsC9PkfCuG7WFmFiQLEOVae ctOx6Jh+ySboJv3Yf88= X-Received: by 10.28.213.75 with SMTP id m72mr8507947wmg.41.1502389474217; Thu, 10 Aug 2017 11:24:34 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id o82sm7978007wmg.34.2017.08.10.11.24.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Aug 2017 11:24:33 -0700 (PDT) From: luca.boccassi@gmail.com To: dev@dpdk.org Cc: Luca Boccassi Date: Thu, 10 Aug 2017 19:23:25 +0100 Message-Id: <20170810182325.14058-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170810182325.14058-1-luca.boccassi@gmail.com> References: <20170628135702.18150-1-lboccass@brocade.com> <20170810182325.14058-1-luca.boccassi@gmail.com> Subject: [dpdk-dev] [PATCH v5 6/6] mk: set -ISCDIR before -IRTE_OUT/include in CFLAGS X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Aug 2017 18:24:35 -0000 From: Luca Boccassi A race condition can happen during parallel builds, where a header might be installed in RTE_OUT/include before CFLAGS is recursively expanded. This causes GCC to sometimes pick the header path as SRCDIR/... and sometimes as RTE_OUT/include/... making the build unreproducible, as the full path is used for the expansion of __FILE__ and in the DWARF directory listing. Always pass -ISRCDIR first to CFLAGS so that it's deterministic. Signed-off-by: Luca Boccassi --- lib/librte_acl/Makefile | 10 ++++++++-- lib/librte_bitratestats/Makefile | 9 ++++++++- lib/librte_cmdline/Makefile | 9 ++++++++- lib/librte_distributor/Makefile | 10 ++++++++-- lib/librte_eal/linuxapp/eal/Makefile | 8 +++++++- lib/librte_efd/Makefile | 10 ++++++++-- lib/librte_gro/Makefile | 9 ++++++++- lib/librte_hash/Makefile | 10 ++++++++-- lib/librte_ip_frag/Makefile | 10 ++++++++-- lib/librte_jobstats/Makefile | 10 ++++++++-- lib/librte_kni/Makefile | 9 ++++++++- lib/librte_kvargs/Makefile | 9 ++++++++- lib/librte_latencystats/Makefile | 9 ++++++++- lib/librte_lpm/Makefile | 10 ++++++++-- lib/librte_mbuf/Makefile | 9 ++++++++- lib/librte_mempool/Makefile | 9 ++++++++- lib/librte_metrics/Makefile | 9 ++++++++- lib/librte_net/Makefile | 9 ++++++++- lib/librte_pdump/Makefile | 10 ++++++++-- lib/librte_power/Makefile | 9 ++++++++- lib/librte_reorder/Makefile | 10 ++++++++-- lib/librte_ring/Makefile | 9 ++++++++- lib/librte_timer/Makefile | 9 ++++++++- lib/librte_vhost/Makefile | 9 ++++++++- 24 files changed, 191 insertions(+), 33 deletions(-) diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile index 59767920a..bce78813b 100644 --- a/lib/librte_acl/Makefile +++ b/lib/librte_acl/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_acl.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_acl_version.map diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile index 58a20ea09..26a3f4908 100644 --- a/lib/librte_bitratestats/Makefile +++ b/lib/librte_bitratestats/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_bitratestats.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_bitratestats_version.map diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile index 644f68e47..9dd75f2d2 100644 --- a/lib/librte_cmdline/Makefile +++ b/lib/librte_cmdline/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_cmdline.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_cmdline_version.map diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile index b417ee7be..a51d7c8b2 100644 --- a/lib/librte_distributor/Makefile +++ b/lib/librte_distributor/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_distributor.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_distributor_version.map diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 90bca4d68..f5eee1c6a 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -41,7 +41,13 @@ LIBABIVER := 5 VPATH += $(RTE_SDK)/lib/librte_eal/common -CFLAGS += -I$(SRCDIR)/include +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR)/include $(CFLAGS) CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include CFLAGS += $(WERROR_FLAGS) -O3 diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile index b9277bc5d..b169e3240 100644 --- a/lib/librte_efd/Makefile +++ b/lib/librte_efd/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_efd.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_efd_version.map diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile index 747eeec9e..367f78299 100644 --- a/lib/librte_gro/Makefile +++ b/lib/librte_gro/Makefile @@ -34,8 +34,15 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_gro.a +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR)/include $(CFLAGS) CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +CFLAGS += $(WERROR_FLAGS) EXPORT_MAP := rte_gro_version.map diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile index 9cf13a045..677d494e7 100644 --- a/lib/librte_hash/Makefile +++ b/lib/librte_hash/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_hash.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_hash_version.map diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile index 4e693bf8f..de45ec2d3 100644 --- a/lib/librte_ip_frag/Makefile +++ b/lib/librte_ip_frag/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_ip_frag.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_ipfrag_version.map diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile index 561a0678c..57329b18e 100644 --- a/lib/librte_jobstats/Makefile +++ b/lib/librte_jobstats/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_jobstats.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_jobstats_version.map diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile index 70f1ca8f6..130d6fd74 100644 --- a/lib/librte_kni/Makefile +++ b/lib/librte_kni/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_kni.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 -fno-strict-aliasing EXPORT_MAP := rte_kni_version.map diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile index 564dd3102..7c332c110 100644 --- a/lib/librte_kvargs/Makefile +++ b/lib/librte_kvargs/Makefile @@ -36,7 +36,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_kvargs.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_kvargs_version.map diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile index eaacbb731..46a8ecd34 100644 --- a/lib/librte_latencystats/Makefile +++ b/lib/librte_latencystats/Makefile @@ -33,7 +33,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_latencystats.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 LDLIBS += -lm LDLIBS += -lpthread diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile index 32be46b3b..6a97fdc97 100644 --- a/lib/librte_lpm/Makefile +++ b/lib/librte_lpm/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_lpm.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_lpm_version.map diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile index 548273054..4d51191ee 100644 --- a/lib/librte_mbuf/Makefile +++ b/lib/librte_mbuf/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_mbuf.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_mbuf_version.map diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile index 7b5bdfee7..33678192f 100644 --- a/lib/librte_mempool/Makefile +++ b/lib/librte_mempool/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_mempool.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_mempool_version.map diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile index d4990e839..195bd4d56 100644 --- a/lib/librte_metrics/Makefile +++ b/lib/librte_metrics/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_metrics.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_metrics_version.map diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile index 56727c4df..a08a7dd8b 100644 --- a/lib/librte_net/Makefile +++ b/lib/librte_net/Makefile @@ -33,7 +33,14 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_net.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_net_version.map LIBABIVER := 1 diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile index 1c03bcbb7..8923d7499 100644 --- a/lib/librte_pdump/Makefile +++ b/lib/librte_pdump/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_pdump.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -CFLAGS += -D_GNU_SOURCE +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 -D_GNU_SOURCE LDLIBS += -lpthread EXPORT_MAP := rte_pdump_version.map diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile index 06cd10e86..b76ad689e 100644 --- a/lib/librte_power/Makefile +++ b/lib/librte_power/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_power.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 -fno-strict-aliasing EXPORT_MAP := rte_power_version.map diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile index 4e44e72f0..51b5d490d 100644 --- a/lib/librte_reorder/Makefile +++ b/lib/librte_reorder/Makefile @@ -34,8 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_reorder.a -CFLAGS += -O3 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_reorder_version.map diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile index 3e2f4b873..e5248a2c1 100644 --- a/lib/librte_ring/Makefile +++ b/lib/librte_ring/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_ring.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during paralle +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_ring_version.map diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile index 03a15390e..0c57cc6d3 100644 --- a/lib/librte_timer/Makefile +++ b/lib/librte_timer/Makefile @@ -34,7 +34,14 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_timer.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during parallel +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_timer_version.map diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile index 4a116fe31..ef0d86990 100644 --- a/lib/librte_vhost/Makefile +++ b/lib/librte_vhost/Makefile @@ -38,7 +38,14 @@ EXPORT_MAP := rte_vhost_version.map LIBABIVER := 4 -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64 +# Include the source dir first, so that headers paths are always picked +# from there. By including it last race conditions might happen during parallel +# builds, and headers might be already installed in RTE_OUT/include when the +# variable is recursively expanded, thus causing GCC to sometimes use the +# SRCDIR path and sometimes the RTE_OUT/include, making the builds not +# reproducible. +CFLAGS := -I$(SRCDIR) $(CFLAGS) +CFLAGS += $(WERROR_FLAGS) -O3 -D_FILE_OFFSET_BITS=64 CFLAGS += -I vhost_user LDLIBS += -lpthread -- 2.11.0