From 34f4049815b262a953116dea00ab12f3a24c80dc Mon Sep 17 00:00:00 2001
From: Toyohisa Kameyama <kameyama@riken.jp>
Date: Thu, 10 Sep 2020 23:59:18 +0900
Subject: dpdk: Avoid option conflicts between spack wrappers and Makefiles on
 aarch64 gcc. (#18603)

---
 var/spack/repos/builtin/packages/dpdk/package.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/dpdk/package.py b/var/spack/repos/builtin/packages/dpdk/package.py
index c25b32c8d7..b01c41be84 100644
--- a/var/spack/repos/builtin/packages/dpdk/package.py
+++ b/var/spack/repos/builtin/packages/dpdk/package.py
@@ -21,6 +21,14 @@ class Dpdk(MakefilePackage):
 
     depends_on('numactl')
 
+    @when('%gcc target=aarch64:')
+    def patch(self):
+        filter_file(
+            r'^MACHINE_CFLAGS',
+            '#MACHINE_CFLAGS',
+            join_path('mk', 'machine', 'armv8a', 'rte.vars.mk')
+        )
+
     def build(self, spec, prefix):
         make('defconfig')
         make()
-- 
cgit v1.2.3-70-g09d2