42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
|
From a5c5b9f76767badb3f198326bd5cbbebba803e36 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Markos Chandras <mchandras@suse.de>
|
||
|
|
Date: Tue, 22 Mar 2016 17:13:36 +0000
|
||
|
|
Subject: [PATCH] mk: fix gcc-5 version on Suse
|
||
|
|
|
||
|
|
In openSUSE Tumbleweed (and in any other SUSE distribution which
|
||
|
|
uses (or will use) gcc >= 5), gcc -dumpversion returns '5'. This is on
|
||
|
|
purpose as discussed in https://bugzilla.opensuse.org/show_bug.cgi?id=941428
|
||
|
|
As a result of which, the gcc-4.x comparison (40 against 5) does not
|
||
|
|
work leading to tons of warnings and failures during build.
|
||
|
|
|
||
|
|
This patch aims to change the way the gcc version is obtained by using
|
||
|
|
the gcc macros directly.
|
||
|
|
This is similar to what's being used in the Linux kernel. Querying the
|
||
|
|
GCC macros directly gives more accurate results compared to -dumpversion
|
||
|
|
which could vary across distributions.
|
||
|
|
|
||
|
|
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
||
|
|
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
|
||
|
|
---
|
||
|
|
mk/toolchain/gcc/rte.toolchain-compat.mk | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
|
||
|
|
index e144216..6eed20c 100644
|
||
|
|
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
|
||
|
|
+++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
|
||
|
|
@@ -38,7 +38,9 @@
|
||
|
|
|
||
|
|
#find out GCC version
|
||
|
|
|
||
|
|
-GCC_VERSION = $(subst .,,$(shell $(CC) -dumpversion | cut -f1-2 -d.))
|
||
|
|
+GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
|
||
|
|
+GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)
|
||
|
|
+GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR)
|
||
|
|
|
||
|
|
# if GCC is older than 4.x
|
||
|
|
ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1)
|
||
|
|
--
|
||
|
|
2.7.3
|
||
|
|
|