diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-18 14:55:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-08-18 14:55:55 +0200 |
| commit | 96f4eed24e99c5c61e3ac63dc67a4e6fee6e23a8 (patch) | |
| tree | ae9634c94c201049ed993054c2f6ca4194591742 | |
| parent | ae2b0049e937054f17ad7135b5744a45451efa49 (diff) | |
| download | ptxdist-96f4eed24e99c5c61e3ac63dc67a4e6fee6e23a8.tar.gz ptxdist-96f4eed24e99c5c61e3ac63dc67a4e6fee6e23a8.tar.xz | |
ncftp: fix building with future OSELAS.Toolchain
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch | 25 | ||||
| -rw-r--r-- | patches/ncftp-3.2.6-src/series | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch b/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch new file mode 100644 index 000000000..97c9edfc3 --- /dev/null +++ b/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sun, 18 Aug 2019 14:51:50 +0200 +Subject: [PATCH] HACK: avoid miss detecting clang + +Without this gcc may be miss detected as clang if the build path contained +the word 'clang'. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index b3095d8d3c34..fb2f9bc9901b 100755 +--- a/configure ++++ b/configure +@@ -1820,7 +1820,7 @@ case "$CC" in + CC_is_clang="yes" + ;; + *) +- cc_dash_v=`${CC-gcc} -v 2>&1 | grep clang 2>/dev/null` ++ cc_dash_v=`${CC-gcc} -v 2>&1 | grep '^clang' 2>/dev/null` + if test -n "$cc_dash_v" ; then + CC_is_clang="yes" + fi diff --git a/patches/ncftp-3.2.6-src/series b/patches/ncftp-3.2.6-src/series index bfdd16f45..1bd3c790e 100644 --- a/patches/ncftp-3.2.6-src/series +++ b/patches/ncftp-3.2.6-src/series @@ -1,4 +1,5 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-HACK-configure-always-assume-cross-compiling.patch -# 208e1462a91a76e211fb1a4173b27f5d - git-ptx-patches magic +0002-HACK-avoid-miss-detecting-clang.patch +# f8d883c4a3df4b49699ecdc988b884d4 - git-ptx-patches magic |