diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-08-16 16:45:05 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-08-16 17:26:23 +0200 |
| commit | c8dad526dc3f83c08f4c889cf702345e96549612 (patch) | |
| tree | 6e78d31b0bfd653dffad6df752cd44f4ba9e4fa0 | |
| parent | 4d47fd34a82e51c88c44aae46b1f5a865b256603 (diff) | |
| download | ptxdist-c8dad526dc3f83c08f4c889cf702345e96549612.tar.gz ptxdist-c8dad526dc3f83c08f4c889cf702345e96549612.tar.xz | |
ncurses: link ncurses6-config to ncurses5-config
Most configure scripts are looking for ncurses5-config, but since commit
3ba149c9c9d89f77ca17149f90097bf033d8746a we use ncurses-5.9 which installs
ncurses6-config. Provide a compatibility link to fix.
Reported-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit 4261a0ff0bd691e638d7d6cc6c27388d08d3be8d)
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/ncurses.make | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rules/ncurses.make b/rules/ncurses.make index cd167c4f7..0879c91dc 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -120,13 +120,20 @@ ifdef PTXCONF_NCURSES_PANEL NCURSES_LIBRARY_LIST += panel endif +NCURSES_WIDE := w endif +NCURSES_MAJOR := 6 +NCURSES_MINOR := 0 + $(STATEDIR)/ncurses.install.post: @$(call targetinfo) @$(call world/install.post, NCURSES) - @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXCONF_SYSROOT_CROSS)/bin" + @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_WIDE)$(NCURSES_MAJOR)-config" \ + "$(PTXCONF_SYSROOT_CROSS)/bin" + @ln -sf -- "ncurses$(NCURSES_WIDE)$(NCURSES_MAJOR)-config" \ + "$(PTXCONF_SYSROOT_CROSS)/bin/ncurses$(NCURSES_WIDE)5-config" ifdef PTXCONF_NCURSES_WIDE_CHAR # Note: This tweak only works if we build the application with these settings! @@ -144,12 +151,6 @@ endif # Target-Install # ---------------------------------------------------------------------------- -ifdef PTXCONF_NCURSES_WIDE_CHAR -NCURSES_WIDE := w -endif -NCURSES_MAJOR := 6 -NCURSES_MINOR := 0 - $(STATEDIR)/ncurses.targetinstall: @$(call targetinfo) |