* [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
@ 2017-02-21 0:37 Ross Burton
2017-02-21 4:58 ` Christopher Larson
0 siblings, 1 reply; 7+ messages in thread
From: Ross Burton @ 2017-02-21 0:37 UTC (permalink / raw)
To: openembedded-core
From: Hongxu Jia <hongxu.jia@windriver.com>
Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/ncurses/files/fix-cflags-mangle.patch | 17 +++++++++++++++++
...{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 3 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} (73%)
diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
new file mode 100644
index 0000000..0308fe1
--- /dev/null
+++ b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
@@ -0,0 +1,17 @@
+configure has a piece of logic to detect users "abusing" CC to hold compiler
+flags (which we do). It also has logic to "correct" this by moving the flags
+from CC to CFLAGS, but the sed only handles a single argument in CC.
+
+Replace the sed with a simple 'cut' call, making the assumption that the first
+word is the compiler name and everything else is an option.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/configure b/configure
+index 7f31208..1a29cfc 100755
+--- a/configure
++++ b/configure
+@@ -2191 +2191 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
+- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
++ cf_flags=`echo "$CC" | cut -f2- -d' '`
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
similarity index 73%
rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
index 6514613..e95741f 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
@@ -1,10 +1,11 @@
require ncurses.inc
SRC_URI += "file://tic-hang.patch \
+ file://fix-cflags-mangle.patch \
file://config.cache \
"
# commit id corresponds to the revision in package version
-SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
+SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
--
2.8.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
2017-02-21 0:37 [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126 Ross Burton
@ 2017-02-21 4:58 ` Christopher Larson
2017-02-21 8:36 ` Burton, Ross
0 siblings, 1 reply; 7+ messages in thread
From: Christopher Larson @ 2017-02-21 4:58 UTC (permalink / raw)
To: Ross Burton; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]
On Mon, Feb 20, 2017 at 5:37 PM, Ross Burton <ross.burton@intel.com> wrote:
> From: Hongxu Jia <hongxu.jia@windriver.com>
>
> Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-core/ncurses/files/fix-cflags-mangle.patch | 17
> +++++++++++++++++
> ...{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 3 ++-
> 2 files changed, 19 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/ncurses/
> files/fix-cflags-mangle.patch
> rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+
> 20161126.bb} (73%)
>
> diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> new file mode 100644
> index 0000000..0308fe1
> --- /dev/null
> +++ b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> @@ -0,0 +1,17 @@
> +configure has a piece of logic to detect users "abusing" CC to hold
> compiler
> +flags (which we do). It also has logic to "correct" this by moving the
> flags
> +from CC to CFLAGS, but the sed only handles a single argument in CC.
> +
> +Replace the sed with a simple 'cut' call, making the assumption that the
> first
> +word is the compiler name and everything else is an option.
>
What will happen when ccache is in use via CCACHE?
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2581 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
2017-02-21 4:58 ` Christopher Larson
@ 2017-02-21 8:36 ` Burton, Ross
0 siblings, 0 replies; 7+ messages in thread
From: Burton, Ross @ 2017-02-21 8:36 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
On 21 February 2017 at 04:58, Christopher Larson <kergoth@gmail.com> wrote:
> What will happen when ccache is in use via CCACHE?
>
Thanks for the excellent review. :)
Ross
[-- Attachment #2: Type: text/html, Size: 549 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
2017-02-21 18:10 Ross Burton
@ 2017-02-22 1:47 ` Hongxu Jia
0 siblings, 0 replies; 7+ messages in thread
From: Hongxu Jia @ 2017-02-22 1:47 UTC (permalink / raw)
To: Ross Burton, openembedded-core
It is fine to me
//Hongxu
On 2017年02月22日 02:10, Ross Burton wrote:
> From: Hongxu Jia <hongxu.jia@windriver.com>
>
> Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> .../recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 ++++++++++++++++++
> ...ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 3 ++-
> 2 files changed, 20 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} (73%)
>
> diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> new file mode 100644
> index 0000000..e9447c5
> --- /dev/null
> +++ b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
> @@ -0,0 +1,18 @@
> +configure has a piece of logic to detect users "abusing" CC to hold compiler
> +flags (which we do). It also has logic to "correct" this by moving the flags
> +from CC to CFLAGS, but the sed only handles a single argument in CC.
> +
> +Replace the sed with awk to filter out all words that start with a hyphen.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Ross Burton <ross.burton@intel.com>
> +
> +diff --git a/configure b/configure
> +index 7f31208..1a29cfc 100755
> +--- a/configure
> ++++ b/configure
> +@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
> +- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
> +- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'`
> ++ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'`
> ++ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'`
> diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> similarity index 73%
> rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
> rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> index 6514613..e95741f 100644
> --- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
> +++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> @@ -1,10 +1,11 @@
> require ncurses.inc
>
> SRC_URI += "file://tic-hang.patch \
> + file://fix-cflags-mangle.patch \
> file://config.cache \
> "
> # commit id corresponds to the revision in package version
> -SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
> +SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
> S = "${WORKDIR}/git"
> EXTRA_OECONF += "--with-abi-version=5"
> UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
@ 2017-02-21 18:10 Ross Burton
2017-02-22 1:47 ` Hongxu Jia
0 siblings, 1 reply; 7+ messages in thread
From: Ross Burton @ 2017-02-21 18:10 UTC (permalink / raw)
To: openembedded-core
From: Hongxu Jia <hongxu.jia@windriver.com>
Add a patch to fix the CC/CFLAGS mangling that broke builds. [RB]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 ++++++++++++++++++
...ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 3 ++-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} (73%)
diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
new file mode 100644
index 0000000..e9447c5
--- /dev/null
+++ b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch
@@ -0,0 +1,18 @@
+configure has a piece of logic to detect users "abusing" CC to hold compiler
+flags (which we do). It also has logic to "correct" this by moving the flags
+from CC to CFLAGS, but the sed only handles a single argument in CC.
+
+Replace the sed with awk to filter out all words that start with a hyphen.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/configure b/configure
+index 7f31208..1a29cfc 100755
+--- a/configure
++++ b/configure
+@@ -2191,2 +2191,2 @@ echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/C
+- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'`
+- CC=`echo "$CC " | sed -e 's/[ ]-[^ ].*$//' -e 's/[ ]*$//'`
++ cf_flags=`echo "$CC" | awk 'BEGIN{ORS=" ";RS=" "} /^-.+/ {print $1}'`
++ CC=`echo "$CC " | awk 'BEGIN{ORS=" ";RS=" "} /^[^-].+/ {print $1}'`
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
similarity index 73%
rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
index 6514613..e95741f 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
@@ -1,10 +1,11 @@
require ncurses.inc
SRC_URI += "file://tic-hang.patch \
+ file://fix-cflags-mangle.patch \
file://config.cache \
"
# commit id corresponds to the revision in package version
-SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
+SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
--
2.8.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
2016-12-22 4:54 Huang Qiyu
@ 2016-12-27 14:33 ` Maxin B. John
0 siblings, 0 replies; 7+ messages in thread
From: Maxin B. John @ 2016-12-27 14:33 UTC (permalink / raw)
To: Huang Qiyu; +Cc: openembedded-core
Hi,
On Thu, Dec 22, 2016 at 12:54:54PM +0800, Huang Qiyu wrote:
> Upgrade ncurses from 6.0+20160625 to 6.0+20161126.
This causes build failures for beaglebone and qemumips64 targets:
http://errors.yoctoproject.org/Errors/Details/115740/
http://errors.yoctoproject.org/Errors/Details/115738/
Please look into that.
> Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
> ---
> .../ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} (84%)
>
> diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> similarity index 84%
> rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
> rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> index 6514613..7328e78 100644
> --- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
> +++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
> @@ -4,7 +4,7 @@ SRC_URI += "file://tic-hang.patch \
> file://config.cache \
> "
> # commit id corresponds to the revision in package version
> -SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
> +SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
> S = "${WORKDIR}/git"
> EXTRA_OECONF += "--with-abi-version=5"
> UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
> --
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126
@ 2016-12-22 4:54 Huang Qiyu
2016-12-27 14:33 ` Maxin B. John
0 siblings, 1 reply; 7+ messages in thread
From: Huang Qiyu @ 2016-12-22 4:54 UTC (permalink / raw)
To: openembedded-core
Upgrade ncurses from 6.0+20160625 to 6.0+20161126.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
.../ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb} (84%)
diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
similarity index 84%
rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
index 6514613..7328e78 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
@@ -4,7 +4,7 @@ SRC_URI += "file://tic-hang.patch \
file://config.cache \
"
# commit id corresponds to the revision in package version
-SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
+SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
S = "${WORKDIR}/git"
EXTRA_OECONF += "--with-abi-version=5"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)"
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-02-22 1:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-21 0:37 [PATCH] ncurses: 6.0+20160625 -> 6.0+20161126 Ross Burton
2017-02-21 4:58 ` Christopher Larson
2017-02-21 8:36 ` Burton, Ross
-- strict thread matches above, loose matches on Subject: below --
2017-02-21 18:10 Ross Burton
2017-02-22 1:47 ` Hongxu Jia
2016-12-22 4:54 Huang Qiyu
2016-12-27 14:33 ` Maxin B. John
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.