diff options
| author | John Crispin <blogic@openwrt.org> | 2015-12-11 15:06:01 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-12-11 15:06:01 +0000 |
| commit | 1d1272f6edac14fa38437b43b72ea70548620c91 (patch) | |
| tree | df42f793f1ca6d7fa9677e809dee8e4000c83c2f | |
| parent | 7e6cf3b5feba5f96d7694498dfbf58e40e8eed29 (diff) | |
| download | master-187ad058-1d1272f6edac14fa38437b43b72ea70548620c91.tar.gz master-187ad058-1d1272f6edac14fa38437b43b72ea70548620c91.tar.bz2 master-187ad058-1d1272f6edac14fa38437b43b72ea70548620c91.zip | |
ncurses: Fix build of libncursew
Packages using libncursesw can fail to build if both libncurses and libncursesw
are not installed. Currently the ncurses.h file is installed in "usr/include/ncursesw"
directory and includes other .h files in the "usr/include" directory incorrectly.
For example: Including <ncursesw/ncurses.h> fails due to these references. These build
changes will set the correct include paths within the developer includes.
Packages that expect ncurses.h (or curses.h) in the default "usr/include" path fail
even when expecting to build with libncursesw and will need to be fixed as well. However,
they cannot be fixed until this patch is applied.
Signed-off-by: Ted Hess <thess@kitschensync.net>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47853 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/libs/ncurses/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 1f7ea9b1b0..924033fd1a 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2013 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=5.9 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -91,6 +91,7 @@ endif ifeq ($(BUILD_VARIANT),libncursesw) CONFIGURE_ARGS += \ --enable-widec \ + --includedir="/usr/include/ncursesw" \ --with-build-cppflags=-D_GNU_SOURCE endif @@ -138,7 +139,7 @@ endef ifeq ($(BUILD_VARIANT),libncursesw) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/ncursesw/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ncursesw/*.h $(1)/usr/include/ncursesw/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/ |