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:39:33 +0200 |
| commit | ca295ad90df78010326e15c856aadf94c531df8d (patch) | |
| tree | 3cd6865b09a1feb4bc175696dc47b1b26131d9ee | |
| parent | 2a7417824983a8ebf4d715abf4257743f51db8b8 (diff) | |
| download | ptxdist-ca295ad90df78010326e15c856aadf94c531df8d.tar.gz ptxdist-ca295ad90df78010326e15c856aadf94c531df8d.tar.xz | |
Revert "ncurses: link ncurses6-config to ncurses5-config"stable/ptxdist-2011.07.x
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>
(cherry picked from commit 8dce94ffa8d3fbabf5f0355aaa6e9b84ecd03f3f)
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 de0f22b32..2609604ea 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -121,20 +121,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! @@ -152,6 +145,12 @@ endif # Target-Install # ---------------------------------------------------------------------------- +ifdef PTXCONF_NCURSES_WIDE_CHAR +NCURSES_WIDE := w +endif +NCURSES_MAJOR := 6 +NCURSES_MINOR := 0 + $(STATEDIR)/ncurses.targetinstall: @$(call targetinfo) |