Hi,
On Thu, Feb 22, 2018 at 11:57:51AM +0100, Michael Olbrich wrote:
> > Which are those? As we are certainly carrying fewer packages that Debian
> > does, isn't it more reasonable to just fix packages?
>
> alsa-utils fails, but I think, that is because the pkg-config files are
> installed to 'platform-XXX/packages/ncurses-6.1yes'. I think you need to
> set that path correctly.
Hmm, even with --with-termlib and --with-ticlib new ncurses are not building
those libraries separately. And here comes problem as pkg-config --libs ncurses
claims '-lncurses -ltinfo' which seems to leak from host.
(so I explicitely disabled separate libraries as it does not make much sense
to build them)
alsa-utils configure then runs:
arm-v5te-linux-gnueabi-gcc -o conftest -g -O2 -D_GNU_SOURCE -D_DEFAULT_SOURCE
conftest.c -lncurses -ltinfo -lasound -lm -ldl -lpthread
which obviously fails with:
arm-v5te-linux-gnueabi/bin/ld: cannot find -ltinfo
collect2: error: ld returned 1 exit status
> Lets try this again without the abi version but correct pc files. So just
> include my other changes but leave the abi-version stuff out for v2.
Seems pc files are not installed at all. Will investigate further, for
now here's what I'm working with:
Subject: ncurses: version bump 5.9 -> 6.1
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
diff --git a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
b/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
deleted file mode 100644
index 0730dc9af..000000000
--- a/patches/ncurses-5.9/0001-teach-ncurses-config-about-sysroot.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Marc Kleine-Budde <m...@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 <m...@pengutronix.de>
----
- misc/ncurses-config.in | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
-index a9c0ac5..08d44bb 100644
---- a/misc/ncurses-config.in
-+++ b/misc/ncurses-config.in
-@@ -73,10 +73,10 @@ while test $# -gt 0; do
- --cflags)
- INCS=
- if test "x@WITH_OVERWRITE@" = xno ; then
-- INCS="$INCS -I${includedir}/${THIS}"
-+ INCS="$INCS -I${SYSROOT}${includedir}/${THIS}"
- 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
-@@ -85,11 +85,11 @@ ENDECHO
- --libs)
- if test @TINFO_NAME@ = @LIB_NAME@ ; then
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
-+ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
- ENDECHO
- else
- sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
-- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB}
@LIBS@
-+ -L${SYSROOT}$libdir @EXTRA_LDFLAGS@ -l${THIS}
-l${TINFO_LIB} @LIBS@
- ENDECHO
- fi
- ;;
-@@ -114,7 +114,7 @@ ENDECHO
- echo "${includedir}"
- ;;
- --libdir)
-- echo "${libdir}"
-+ echo "${SYSROOT}${libdir}"
- ;;
- --mandir)
- echo "${mandir}"
diff --git a/patches/ncurses-5.9/series b/patches/ncurses-5.9/series
deleted file mode 100644
index fbdd3447d..000000000
--- a/patches/ncurses-5.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-teach-ncurses-config-about-sysroot.patch
-# 2ecf3769442e2e5fb7e575d0a880d32c - git-ptx-patches magic
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 <m...@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 <m...@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
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make
index c543cb4ca..083ab9b1a 100644
--- a/rules/host-ncurses.make
+++ b/rules/host-ncurses.make
@@ -24,10 +24,7 @@ HOST_NCURSES_CONF_TOOL := autoconf
HOST_NCURSES_CONF_OPT = \
$(HOST_AUTOCONF) \
$(NCURSES_AUTOCONF_SHARED) \
- --without-shared \
- --without-cxx-binding
-
-HOST_NCURSES_CPPFLAGS := -P
+ --without-shared
# ----------------------------------------------------------------------------
# Install
diff --git a/rules/ncurses.make b/rules/ncurses.make
index c2fcde478..c08dca0fd 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
#
# Paths and names
#
-NCURSES_VERSION := 5.9
+NCURSES_VERSION := 6.1
NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5 := 8cb9c412e5f2d96bc6f459aa8c6282a1
+NCURSES_MD5 := 98c889aaf8d23910d2b92d65be2e737a
NCURSES := ncurses-$(NCURSES_VERSION)
NCURSES_SUFFIX := tar.gz
NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
@@ -25,66 +25,68 @@ NCURSES_SOURCE :=
$(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
NCURSES_DIR := $(BUILDDIR)/$(NCURSES)
NCURSES_LICENSE := MIT
NCURSES_LICENSE_FILES := \
-
file://include/curses.h.in;startline=2;endline=26;md5=3d0f6ef3745ae794471d5c62b7deb9c3
+
file://include/curses.h.in;startline=2;endline=26;md5=12de1a79061c9246decc146201452dc5
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
-NCURSES_ENV := \
+NCURSES_CONF_TOOL := autoconf
+NCURSES_CONF_ENV := \
$(CROSS_ENV) \
TIC_PATH="$(PTXCONF_SYSROOT_HOST)/bin/tic"
-
-NCURSES_AUTOCONF_SHARED := \
- --without-cxx-binding \
- --disable-echo \
- --disable-nls \
- --enable-const \
- --enable-overwrite \
- --libdir=/$(CROSS_LIB_DIR) \
- --without-debug \
- --without-normal \
+# NOTE: reentrant enables opaque, which breaks other packages
+# pthread enables reentrant, so don't enable it either
+NCURSES_AUTCONF_SHARED := \
+ $(CROSS_AUTOCONF_USR) \
--without-ada \
- --without-gpm \
+ --without-cxx \
+ --without-cxx-binding \
+ --enable-db-install \
--without-manpages \
+ --without-progs \
+ --without-tack \
--without-tests \
+ --with-curses-h \
+ --enable-pc-files \
--enable-mixed-case \
- --with-ticlib=yes \
+ --without-libtool \
+ --with-normal \
+ --without-debug \
+ --without-profile \
+ --without-cxx-shared \
+ --without-termlib \
+ --without-ticlib \
+ --without-gpm \
+ --without-dlsym \
+ --without-sysmouse \
+ --disable-rpath \
--disable-relink \
+ --disable-rpath-hack \
+ --enable-overwrite \
+ --$(call ptx/endis,PTXCONF_NCURSES_BIG_CORE)-big-core \
--disable-big-strings \
- --disable-sp-funcs \
+ --$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-widec \
+ $(GLOBAL_LARGE_FILE_OPTION) \
+ --enable-ext-funcs \
+ --enable-sp-funcs \
--disable-term-driver \
+ --enable-const \
+ --enable-ext-colors \
--disable-ext-mouse \
- --disable-interop \
- --disable-rpath \
- --disable-rpath-hack \
- --disable-ext-colors \
+ --disable-ext-putwin \
+ --disable-no-padding \
+ --disable-signed-char \
+ --disable-sigwinch \
--without-pthread \
- --disable-reentrant
-
-# NOTE: reentrant enables opaque, which breaks other packages
-# pthread enables reentrant, so don't enable it either
+ --disable-reentrant \
+ --without-develop \
+ --disable-interop
-# enable wide char support on demand only
-ifdef PTXCONF_NCURSES_WIDE_CHAR
-NCURSES_AUTOCONF_SHARED += --enable-widec
-else
-NCURSES_AUTOCONF_SHARED += --disable-widec
-endif
-
-ifdef PTXCONF_NCURSES_BIG_CORE
-NCURSES_AUTOCONF_SHARED += --enable-big-core
-else
-NCURSES_AUTOCONF_SHARED += --disable-big-core
-endif
-
-NCURSES_AUTOCONF := \
+NCURSES_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(NCURSES_AUTOCONF_SHARED) \
- --with-shared \
- --without-progs
-
-NCURSES_CPPFLAGS := -P
+ --with-shared
# ----------------------------------------------------------------------------
# Install
@@ -123,10 +125,10 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR
for lib in $(NCURSES_LIBRARY_LIST); do \
echo "INPUT(-l$${lib}w)" >
$(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/lib$${lib}.so ; \
done
- echo "INPUT(-lncursesw)" >
$(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so
+ @echo "INPUT(-lncursesw)" >
$(NCURSES_PKGDIR)/$(CROSS_LIB_DIR)/libcurses.so
- ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \
- "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"
+ @ln -sf "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config"\
+ "ncursesw$(NCURSES_MAJOR)-config"
endif
@$(call touch)
diff --git a/rules/pre/ncurses.make b/rules/pre/ncurses.make
index d38bdebd3..89fefa8d8 100644
--- a/rules/pre/ncurses.make
+++ b/rules/pre/ncurses.make
@@ -8,27 +8,27 @@
#
# defaults
-CROSS_ENV_AC_NCURSESW5_CONFIG := no
-CROSS_ENV_AC_NCURSES5_CONFIG := no
+CROSS_ENV_AC_NCURSESW6_CONFIG := no
+CROSS_ENV_AC_NCURSES6_CONFIG := no
# modify if ncurses is enabled
ifdef PTXCONF_NCURSES
ifdef PTXCONF_NCURSES_WIDE_CHAR
-CROSS_ENV_AC_NCURSESW5_CONFIG := yes
+CROSS_ENV_AC_NCURSESW6_CONFIG := yes
endif
-CROSS_ENV_AC_NCURSES5_CONFIG := yes
+CROSS_ENV_AC_NCURSES6_CONFIG := yes
endif
CROSS_ENV_AC_NCURSES := \
- ac_cv_prog_ncurses5_config=$(CROSS_ENV_AC_NCURSES5_CONFIG) \
- ac_cv_prog_ncursesw5_config=$(CROSS_ENV_AC_NCURSESW5_CONFIG)
+ ac_cv_prog_ncurses6_config=$(CROSS_ENV_AC_NCURSES6_CONFIG) \
+ ac_cv_prog_ncursesw6_config=$(CROSS_ENV_AC_NCURSESW6_CONFIG)
CROSS_ENV_AC_NO_NCURSES := \
ac_cv_header_ncurses_h=no \
ac_cv_header_ncurses_ncurses_h=no \
ac_cv_lib_ncurses_initscr=no \
- ac_cv_prog_ncurses5_config=no \
- ac_cv_prog_ncursesw5_config=no
+ ac_cv_prog_ncurses6_config=no \
+ ac_cv_prog_ncursesw6_config=no
#
# $(call ptx/ncurses, PTXCONF_SYMBOL) returns env with ncurses hint or not
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
