| Message ID | 1487637458-15893-1-git-send-email-ross.burton@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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+)*)"