diff mbox

[dpdk-dev] bus/dpaa: fix compilation issue with meson build

Message ID 20180604025246.25548-1-jerin.jacob@caviumnetworks.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Jerin Jacob June 4, 2018, 2:52 a.m. UTC 
  ccache gcc -Idrivers/drivers@@tmp_rte_pmd_dpaa_sec@sta -Idrivers
In file included from ../drivers/bus/dpaa/include/fsl_usd.h:11,
                 from ../drivers/crypto/dpaa_sec/dpaa_sec.c:27:
../drivers/bus/dpaa/include/compat.h:53:
 error: "__packed" redefined [-Werror]
 #define __packed __rte_packed

In file included from /usr/include/bsd/string.h:39,
from ../lib/librte_eal/common/include/rte_string_fns.h:71,
from ../drivers/crypto/dpaa_sec/dpaa_sec.c:25:
/usr/include/bsd/sys/cdefs.h:120: note: this is the location
of the previous definition
#  define __packed __attribute__((__packed__))

Cc: stable@dpdk.org
Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
 drivers/bus/dpaa/include/compat.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Shreyansh Jain June 5, 2018, 6:20 a.m. UTC | #1 
On 6/4/2018 8:22 AM, Jerin Jacob wrote:
> ccache gcc -Idrivers/drivers@@tmp_rte_pmd_dpaa_sec@sta -Idrivers
> In file included from ../drivers/bus/dpaa/include/fsl_usd.h:11,
>                   from ../drivers/crypto/dpaa_sec/dpaa_sec.c:27:
> ../drivers/bus/dpaa/include/compat.h:53:
>   error: "__packed" redefined [-Werror]
>   #define __packed __rte_packed
> 
> In file included from /usr/include/bsd/string.h:39,
> from ../lib/librte_eal/common/include/rte_string_fns.h:71,
> from ../drivers/crypto/dpaa_sec/dpaa_sec.c:25:
> /usr/include/bsd/sys/cdefs.h:120: note: this is the location
> of the previous definition
> #  define __packed __attribute__((__packed__))
> 
> Cc: stable@dpdk.org
> Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> 
> Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> ---

Thanks Jerin.
Somehow, this didn't appear on my build environment (maybe because LIB 
BSD is not enabled?). But, the change looks harmless.

Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
Thomas Monjalon June 21, 2018, 8:25 a.m. UTC | #2 
05/06/2018 08:20, Shreyansh Jain:
> On 6/4/2018 8:22 AM, Jerin Jacob wrote:
> > ccache gcc -Idrivers/drivers@@tmp_rte_pmd_dpaa_sec@sta -Idrivers
> > In file included from ../drivers/bus/dpaa/include/fsl_usd.h:11,
> >                   from ../drivers/crypto/dpaa_sec/dpaa_sec.c:27:
> > ../drivers/bus/dpaa/include/compat.h:53:
> >   error: "__packed" redefined [-Werror]
> >   #define __packed __rte_packed
> > 
> > In file included from /usr/include/bsd/string.h:39,
> > from ../lib/librte_eal/common/include/rte_string_fns.h:71,
> > from ../drivers/crypto/dpaa_sec/dpaa_sec.c:25:
> > /usr/include/bsd/sys/cdefs.h:120: note: this is the location
> > of the previous definition
> > #  define __packed __attribute__((__packed__))
> > 
> > Cc: stable@dpdk.org
> > Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros")
> > 
> > Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> > ---
> 
> Thanks Jerin.
> Somehow, this didn't appear on my build environment (maybe because LIB 
> BSD is not enabled?). But, the change looks harmless.
> 
> Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>

I missed this patch and sent a more complete one recently:

	https://patches.dpdk.org/patch/41314/
diff mbox

Patch

diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h
index e4b570214..0b49ed5e4 100644
--- a/drivers/bus/dpaa/include/compat.h
+++ b/drivers/bus/dpaa/include/compat.h
@@ -50,7 +50,9 @@ 
 /* Required compiler attributes */
 #define __maybe_unused	__rte_unused
 #define __always_unused	__rte_unused
+#ifndef __packed
 #define __packed	__rte_packed
+#endif
 #define noinline	__attribute__((noinline))
 
 #define L1_CACHE_BYTES 64