1. Upgrade ncurses from 6.0+20161126 to 6.0+20170408 2. Delete the following patch file becuase new version already uses the awk to filter words. fix-cflags-mangle.patch
Signed-off-by: Fan Xin <fan....@jp.fujitsu.com> --- .../recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 ------------------ ...ncurses_6.0+20161126.bb => ncurses_6.0+20170408.bb} | 3 +-- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 meta/recipes-core/ncurses/files/fix-cflags-mangle.patch rename meta/recipes-core/ncurses/{ncurses_6.0+20161126.bb => ncurses_6.0+20170408.bb} (76%) diff --git a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch deleted file mode 100644 index e9447c5..0000000 --- a/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch +++ /dev/null @@ -1,18 +0,0 @@ -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.bur...@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+20161126.bb b/meta/recipes-core/ncurses/ncurses_6.0+20170408.bb similarity index 76% rename from meta/recipes-core/ncurses/ncurses_6.0+20161126.bb rename to meta/recipes-core/ncurses/ncurses_6.0+20170408.bb index ace3108..02db551 100644 --- a/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0+20170408.bb @@ -1,12 +1,11 @@ require ncurses.inc SRC_URI += "file://tic-hang.patch \ - file://fix-cflags-mangle.patch \ file://config.cache \ file://configure-reproducible.patch \ " # commit id corresponds to the revision in package version -SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" +SRCREV = "9e9f3df43c491e8f046345b9d1aa54ad57201df2" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" -- 1.9.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core