diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2018-02-28 07:57:15 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-28 08:10:20 +0100 |
| commit | e0577e5eb038d3727fbd5fec7711883bcb319bf2 (patch) | |
| tree | d5e57752661fa994b9d69d860b926c40bc04cfcb /patches/ncurses-6.1 | |
| parent | 58008691b46e09d4f582766eae399029f05b9fe4 (diff) | |
| download | ptxdist-e0577e5eb038d3727fbd5fec7711883bcb319bf2.tar.gz ptxdist-e0577e5eb038d3727fbd5fec7711883bcb319bf2.tar.xz | |
ncurses: version bump 5.9 -> 6.1
Wih update to ncurses-6.1 also:
- sort configure options the way they appear in configure to make
future reviews easies
- as C++ code is not built remove CPPFLAGS
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/ncurses-6.1')
| -rw-r--r-- | patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch | 49 | ||||
| -rw-r--r-- | patches/ncurses-6.1/series | 4 |
2 files changed, 53 insertions, 0 deletions
diff --git a/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch new file mode 100644 index 000000000..64a0e960a --- /dev/null +++ b/patches/ncurses-6.1/0001-teach-ncurses-config-about-sysroot.patch @@ -0,0 +1,49 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Thu, 17 Mar 2011 13:34:53 +0100 +Subject: [PATCH] teach ncurses-config about sysroot + +This patch teaches ncurses-config about sysroot + +Signed-off-by: Marc Kleine-Budde <mkl@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 @@ + --cflags) + INCS="@PKG_CFLAGS@" + if test "x@WITH_OVERWRITE@" = xno ; then +- INCS="$INCS -I${includesubdir}" ++ INCS="$INCS -I${SYSROOT}${includesubdir}" + fi +- if test "${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 @@ + echo $INCS + ;; + --libdir) +- echo "${libdir}" ++ echo "${SYSROOT}${libdir}" + ;; + --mandir) + echo "${mandir}" diff --git a/patches/ncurses-6.1/series b/patches/ncurses-6.1/series new file mode 100644 index 000000000..fbdd3447d --- /dev/null +++ b/patches/ncurses-6.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-teach-ncurses-config-about-sysroot.patch +# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic |