From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 610A823D for ; Mon, 30 Jul 2018 18:15:39 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=lap.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fkAoz-00009D-35; Mon, 30 Jul 2018 16:14:57 +0000 From: Christian Ehrhardt To: Thomas Monjalon Cc: Shreyansh Jain , dpdk stable Date: Mon, 30 Jul 2018 18:11:16 +0200 Message-Id: <20180730161342.16566-31-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730161342.16566-1-christian.ehrhardt@canonical.com> References: <20180730161342.16566-1-christian.ehrhardt@canonical.com> Subject: [dpdk-stable] patch 'bus/dpaa: fix build' has been queued to stable release 18.05.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 16:15:39 -0000 Hi, FYI, your patch has been queued to stable release 18.05.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/01/18. So please shout if anyone has objections. Thanks. Christian Ehrhardt --- >>From da8a90991927cf183d66930e0d649e59e6ab59fd Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 Jun 2018 12:38:06 +0200 Subject: [PATCH] bus/dpaa: fix build [ upstream commit ce819b84220ef4abe87cccc71c78e7f4bc7a2f8b ] The DPAA bus driver is defining some macros without prefix. So it can conflict with other libraries like libbsd: drivers/bus/dpaa/include/compat.h:53: error: "__packed" redefined /usr/include/bsd/sys/cdefs.h:120: note: this is the location of the previous definition Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros") Signed-off-by: Thomas Monjalon Acked-by: Shreyansh Jain --- drivers/bus/dpaa/include/compat.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h index e4b570214..92241d231 100644 --- a/drivers/bus/dpaa/include/compat.h +++ b/drivers/bus/dpaa/include/compat.h @@ -48,9 +48,15 @@ */ /* Required compiler attributes */ +#ifndef __maybe_unused #define __maybe_unused __rte_unused +#endif +#ifndef __always_unused #define __always_unused __rte_unused +#endif +#ifndef __packed #define __packed __rte_packed +#endif #define noinline __attribute__((noinline)) #define L1_CACHE_BYTES 64 -- 2.17.1