diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/ncurses')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/ncurses/files/configure-reproducible.patch | 20 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch | 18 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc | 8 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb (renamed from import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb) | 4 |
4 files changed, 47 insertions, 3 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/files/configure-reproducible.patch b/import-layers/yocto-poky/meta/recipes-core/ncurses/files/configure-reproducible.patch new file mode 100644 index 000000000..54a8bdc6b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/ncurses/files/configure-reproducible.patch @@ -0,0 +1,20 @@ +"configure" enforces -U for ar flags, breaking deterministic builds. +The flag was added to fix some vaguely specified "recent POSIX binutil +build problems" in 2015. + +Upstream-Status: Pending +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> + +diff --git a/configure b/configure +index 7f31208..aa80911 100755 +--- a/configure ++++ b/configure +@@ -4428,7 +4428,7 @@ if test "${cf_cv_ar_flags+set}" = set; then + else + + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch b/import-layers/yocto-poky/meta/recipes-core/ncurses/files/fix-cflags-mangle.patch new file mode 100644 index 000000000..e9447c5b8 --- /dev/null +++ b/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc b/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc index ff0117b82..1f21cd413 100644 --- a/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc +++ b/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc @@ -7,7 +7,8 @@ SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" -BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" +BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ + ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" inherit autotools binconfig-disabled multilib_header pkgconfig @@ -17,6 +18,8 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git" EXTRA_AUTORECONF = "-I m4" CONFIG_SITE =+ "${WORKDIR}/config.cache" +EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'" + # Whether to enable separate widec libraries; must be 'true' or 'false' # # TODO: remove this variable when widec is supported in every setup? @@ -65,7 +68,6 @@ ncurses_configure() { cd $1 shift oe_runconf \ - --disable-static \ --without-debug \ --without-ada \ --without-gpm \ @@ -278,6 +280,8 @@ FILES_${PN} = "\ ${bindir}/tset \ ${bindir}/ncurses5-config \ ${bindir}/ncursesw5-config \ + ${bindir}/ncurses6-config \ + ${bindir}/ncursesw6-config \ ${datadir}/tabset \ " diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb b/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb index 6514613fe..ace310800 100644 --- a/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb +++ b/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb @@ -1,10 +1,12 @@ 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 = "63dd558cb8e888d6fab5f00bbf7842736a2356b9" +SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+(\+\d+)*)" |