diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-08-17 16:37:23 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-08-17 16:37:23 +0200 |
| commit | 8dce94ffa8d3fbabf5f0355aaa6e9b84ecd03f3f (patch) | |
| tree | d277ff1ef1eab1366998f346af0042b5befa3c3e | |
| parent | 1533edfdbd2c6a0b26f389c9253ff178d0940500 (diff) | |
| download | ptxdist-8dce94ffa8d3fbabf5f0355aaa6e9b84ecd03f3f.tar.gz ptxdist-8dce94ffa8d3fbabf5f0355aaa6e9b84ecd03f3f.tar.xz | |
Revert "ncurses: link ncurses6-config to ncurses5-config"
This reverts commit 4261a0ff0bd691e638d7d6cc6c27388d08d3be8d.
With commit 026818241ff182e23cdf6fae6fbdd0d35aef72b4 we disable
reentrant and pthread so that the major of ncurses if back to 5.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | rules/ncurses.make | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/rules/ncurses.make b/rules/ncurses.make index 9b4d0e02e..7b2873c36 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -110,20 +110,13 @@ 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/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" + @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXCONF_SYSROOT_CROSS)/bin" ifdef PTXCONF_NCURSES_WIDE_CHAR # Note: This tweak only works if we build the application with these settings! @@ -141,6 +134,12 @@ endif # Target-Install # ---------------------------------------------------------------------------- +ifdef PTXCONF_NCURSES_WIDE_CHAR +NCURSES_WIDE := w +endif +NCURSES_MAJOR := 6 +NCURSES_MINOR := 0 + $(STATEDIR)/ncurses.targetinstall: @$(call targetinfo) |