diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2020-07-26 16:24:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-07-31 06:11:32 +0200 |
| commit | bd70980bdc8b561dd65aec54e62e39cdf79ec13a (patch) | |
| tree | d36abf34405a90422ba58f4b4f673aaa6a3d40e0 /patches | |
| parent | 471f5e0889e7102e09f6e37391a4eb45871d5685 (diff) | |
| download | ptxdist-bd70980bdc8b561dd65aec54e62e39cdf79ec13a.tar.gz ptxdist-bd70980bdc8b561dd65aec54e62e39cdf79ec13a.tar.xz | |
ncurses: version bump 6.1 -> 6.2
Patches have been ported, one new configure option.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Message-Id: <20200726142436.3113607-1-r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch (renamed from patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch) | 28 | ||||
| -rw-r--r-- | patches/ncurses-6.2/series (renamed from patches/ncurses-6.1/series) | 0 |
2 files changed, 8 insertions, 20 deletions
diff --git a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch index 64a0e960a..707b5a49c 100644 --- a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch +++ b/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch @@ -5,40 +5,28 @@ Subject: [PATCH] teach ncurses-config about sysroot This patch teaches ncurses-config about sysroot Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +[ported from ncurses 6.1 to 6.2] +Signed-off-by: Robert Schwebel <rsc@pengutronix.de> --- misc/ncurses-config.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ---- ncurses-6.1/misc/ncurses-config.in 2017-12-09 23:45:44.000000000 +0100 -+++ ncurses-6.1/misc/ncurses-config.in 2018-02-08 13:50:07.365266351 +0100 -@@ -101,21 +101,21 @@ +--- ncurses-6.2/misc/ncurses-config.in 2020-02-03 00:34:34.000000000 +0100 ++++ ncurses-6.2-ptx/misc/ncurses-config.in 2020-07-25 23:28:48.123350040 +0200 +@@ -149,10 +149,10 @@ --cflags) INCS="@PKG_CFLAGS@" - if test "x@WITH_OVERWRITE@" = xno ; then + if [ "x@WITH_OVERWRITE@" = xno ]; then - INCS="$INCS -I${includesubdir}" + INCS="$INCS -I${SYSROOT}${includesubdir}" fi -- if test "${includedir}" != /usr/include ; then + if [ "${includedir}" != /usr/include ]; then - INCS="$INCS -I${includedir}" -+ if test "${SYSROOT}${includedir}" != /usr/include ; then + INCS="$INCS -I${SYSROOT}${includedir}" fi sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO $INCS - ENDECHO - ;; - --libs) -- if test "$libdir" = /usr/lib -+ if test "${SYSROOT}$libdir" = /usr/lib - then - LIBDIR= - else -- LIBDIR=-L$libdir -+ LIBDIR=-L${SYSROOT}$libdir - fi - if test @TINFO_NAME@ = @LIB_NAME@ ; then - sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO -@@ -154,7 +154,7 @@ +@@ -235,7 +235,7 @@ echo $INCS ;; --libdir) diff --git a/patches/ncurses-6.1/series b/patches/ncurses-6.2/series index fbdd3447d..fbdd3447d 100644 --- a/patches/ncurses-6.1/series +++ b/patches/ncurses-6.2/series |