[PATCH v1] mk: fix make defconfig on FreeBSD

[PATCH v1] mk: fix make defconfig on FreeBSD

[David Hunt]

Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")

Signed-off-by: David Hunt <david.hunt@intel.com>
---
 mk/rte.sdkconfig.mk | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 0664725ee..7b1684375 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -36,6 +36,7 @@ notemplate:
 	@echo "use T=template from the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
 
+compiler:=$(filter clang gcc icc cc,$(shell ${CC} --version))
 
 .PHONY: defconfig
 defconfig:
@@ -47,15 +48,25 @@ defconfig:
                         print "arm-armv7a"} \
                 else if ($$0 == "ppc64") { \
                         print "ppc_64-power8"} \
+                else if ($$0 == "amd64") { \
+                        print "x86_64-native"} \
                 else { \
-                        printf "%s-native", $$0} }')-$(shell \
+                        printf "%s-native", $$0} }' \
+		)-$(shell \
                 uname | awk '{ \
                 if ($$0 == "Linux") { \
                         print "linuxapp"} \
                 else { \
-                        print "bsdapp"} }')-$(shell \
-                ${CC} -v 2>&1 | \
-                grep " version " | cut -d ' ' -f 1)
+                        print "bsdapp"} }' \
+		)-$(shell \
+		echo | awk -v compiler=${compiler} \
+		'{ \
+		if (compiler == "cc") \
+			{ print "gcc" } \
+		else \
+			{ print compiler } \
+		}' \
+		)
 
 .PHONY: config
 ifeq ($(RTE_CONFIG_TEMPLATE),)
-- 
2.14.1

Re: [PATCH v1] mk: fix make defconfig on FreeBSD

[Thomas Monjalon]

10/04/2018 17:08, David Hunt:
> Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")
> 
> Signed-off-by: David Hunt <david.hunt@intel.com>

I am sorry, I have to nack because the change is not explained.

Re: [PATCH v1] mk: fix make defconfig on FreeBSD

[Hunt, David]

On 10/4/2018 4:28 PM, Thomas Monjalon wrote:
> 10/04/2018 17:08, David Hunt:
>> Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")
>>
>> Signed-off-by: David Hunt <david.hunt@intel.com>
> I am sorry, I have to nack because the change is not explained.
>
>

Apologies, Thomas. I have now added an explanation of what's going on on 
the patch and pushed up a v2.

Regards,
Dave.

Re: [PATCH v1] mk: fix make defconfig on FreeBSD

[Burakov, Anatoly]

On 10-Apr-18 4:08 PM, David Hunt wrote:
> Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")
> 
> Signed-off-by: David Hunt <david.hunt@intel.com>
> ---

Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>

-- 
Thanks,
Anatoly

[PATCH v2] mk: fix make defconfig on FreeBSD

[David Hunt]

On FreeBSD, make defconfig generates the config as "defconfig_x86_64-bsdapp-",
which does not resolve to any known config file.

This fix starts by introducing a 'compiler' variable which is set by executing
"${CC} --version" and pulling out the name of the compiler.

On FreeBDS, we get amd64 out of "uname -m", which was not handled by the list
of checks, but which now resolves to x86_64-native

The remaining code in the patch then takes ${compiler}, the "uname -m"
output and assembles them all together into a valid freebsd config name,
i.e. "defconfig_x86_64-native-bsdapp-clang"

Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")

Signed-off-by: David Hunt <david.hunt@intel.com>
---
 mk/rte.sdkconfig.mk | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 0664725ee..7b1684375 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -36,6 +36,7 @@ notemplate:
 	@echo "use T=template from the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
 
+compiler:=$(filter clang gcc icc cc,$(shell ${CC} --version))
 
 .PHONY: defconfig
 defconfig:
@@ -47,15 +48,25 @@ defconfig:
                         print "arm-armv7a"} \
                 else if ($$0 == "ppc64") { \
                         print "ppc_64-power8"} \
+                else if ($$0 == "amd64") { \
+                        print "x86_64-native"} \
                 else { \
-                        printf "%s-native", $$0} }')-$(shell \
+                        printf "%s-native", $$0} }' \
+		)-$(shell \
                 uname | awk '{ \
                 if ($$0 == "Linux") { \
                         print "linuxapp"} \
                 else { \
-                        print "bsdapp"} }')-$(shell \
-                ${CC} -v 2>&1 | \
-                grep " version " | cut -d ' ' -f 1)
+                        print "bsdapp"} }' \
+		)-$(shell \
+		echo | awk -v compiler=${compiler} \
+		'{ \
+		if (compiler == "cc") \
+			{ print "gcc" } \
+		else \
+			{ print compiler } \
+		}' \
+		)
 
 .PHONY: config
 ifeq ($(RTE_CONFIG_TEMPLATE),)
-- 
2.14.1

Re: [PATCH v2] mk: fix make defconfig on FreeBSD

[Burakov, Anatoly]

On 10-Apr-18 4:44 PM, David Hunt wrote:
> On FreeBSD, make defconfig generates the config as "defconfig_x86_64-bsdapp-",
> which does not resolve to any known config file.
> 
> This fix starts by introducing a 'compiler' variable which is set by executing
> "${CC} --version" and pulling out the name of the compiler.
> 
> On FreeBDS, 

^^ FreeBSD :)

we get amd64 out of "uname -m", which was not handled by the list
> of checks, but which now resolves to x86_64-native

Probably should end with a period?

> 
> The remaining code in the patch then takes ${compiler}, the "uname -m"
> output and assembles them all together into a valid freebsd config name,
> i.e. "defconfig_x86_64-native-bsdapp-clang"

Same here, end with period?

> 
> Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")
> 
> Signed-off-by: David Hunt <david.hunt@intel.com>
> ---

Left out my Tested-by.

-- 
Thanks,
Anatoly

Re: [PATCH v2] mk: fix make defconfig on FreeBSD

[Thomas Monjalon]

10/04/2018 17:44, David Hunt:
> On FreeBSD, make defconfig generates the config as "defconfig_x86_64-bsdapp-",
> which does not resolve to any known config file.
> 
> This fix starts by introducing a 'compiler' variable which is set by executing
> "${CC} --version" and pulling out the name of the compiler.
[...]
> +compiler:=$(filter clang gcc icc cc,$(shell ${CC} --version))

You should not invoke a shell command outside of a rule.
Please try to move it inside the defconfig context.

Reason for this query?
1/ avoid polluting the rest of the makefile
2/ it breaks doc compilation

Why it breaks doc?
Because it breaks "make -R showversion" which is called in doc/guides/conf.py.
Tip: CC is not always defined :)

[PATCH v3] mk: fix make defconfig on FreeBSD

[David Hunt]

On FreeBSD, make defconfig generates the config as
"defconfig_x86_64-bsdapp-", which does not resolve to any known
config file.

On FreeBSD, we get amd64 out of "uname -m", which was not handled by
the list of checks, but which now resolves to x86_64-native.

Then we run '$CC --version', and use grep -o with the list of known
compilers, and set to either gcc, icc or clang. Grep's '-o' option
returns the matched word rather than the whole line, making the
result easier to use.

The remaining code in the patch then takes ${compiler}, the "uname -m"
output and assembles them all together into a valid freebsd config name,
i.e. "defconfig_x86_64-native-bsdapp-clang".

v3 fixes:
   Removed the call to $CC outside of the defconfig rule.
   No longer breaks the 'make -R showversion'.
   Simplified working out the compiler name using grep -o.

Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")

Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>
Signed-off-by: David Hunt <david.hunt@intel.com>
---
 mk/rte.sdkconfig.mk | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 0664725ee..d90d62cc6 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -36,7 +36,6 @@ notemplate:
 	@echo "use T=template from the following list:"
 	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
 
-
 .PHONY: defconfig
 defconfig:
 	@$(MAKE) config T=$(shell \
@@ -47,15 +46,25 @@ defconfig:
                         print "arm-armv7a"} \
                 else if ($$0 == "ppc64") { \
                         print "ppc_64-power8"} \
+                else if ($$0 == "amd64") { \
+                        print "x86_64-native"} \
                 else { \
-                        printf "%s-native", $$0} }')-$(shell \
+                        printf "%s-native", $$0} }' \
+		)-$(shell \
                 uname | awk '{ \
                 if ($$0 == "Linux") { \
                         print "linuxapp"} \
                 else { \
-                        print "bsdapp"} }')-$(shell \
-                ${CC} -v 2>&1 | \
-                grep " version " | cut -d ' ' -f 1)
+                        print "bsdapp"} }' \
+		)-$(shell \
+		${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \
+		'{ \
+		if ($$1 == "cc") { \
+			print "gcc" } \
+		else { \
+			print $$1 } \
+		}' \
+		)
 
 .PHONY: config
 ifeq ($(RTE_CONFIG_TEMPLATE),)
-- 
2.14.1

Re: [PATCH v3] mk: fix make defconfig on FreeBSD

[Thomas Monjalon]

23/04/2018 15:09, David Hunt:
> On FreeBSD, make defconfig generates the config as
> "defconfig_x86_64-bsdapp-", which does not resolve to any known
> config file.
> 
> On FreeBSD, we get amd64 out of "uname -m", which was not handled by
> the list of checks, but which now resolves to x86_64-native.
> 
> Then we run '$CC --version', and use grep -o with the list of known
> compilers, and set to either gcc, icc or clang. Grep's '-o' option
> returns the matched word rather than the whole line, making the
> result easier to use.
> 
> The remaining code in the patch then takes ${compiler}, the "uname -m"
> output and assembles them all together into a valid freebsd config name,
> i.e. "defconfig_x86_64-native-bsdapp-clang".
> 
> v3 fixes:
>    Removed the call to $CC outside of the defconfig rule.
>    No longer breaks the 'make -R showversion'.
>    Simplified working out the compiler name using grep -o.
> 
> Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig")
> 
> Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>
> Signed-off-by: David Hunt <david.hunt@intel.com>

Applied, thanks