hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>

SVN-Revision: 47853
lede-17.01
John Crispin 2015-12-11 15:06:01 +00:00
parent f03bf608b1
commit 354aa80ada
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/libs/ncurses/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses PKG_NAME:=ncurses
PKG_VERSION:=5.9 PKG_VERSION:=5.9
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -91,6 +91,7 @@ endif
ifeq ($(BUILD_VARIANT),libncursesw) ifeq ($(BUILD_VARIANT),libncursesw)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-widec \ --enable-widec \
--includedir="/usr/include/ncursesw" \
--with-build-cppflags=-D_GNU_SOURCE --with-build-cppflags=-D_GNU_SOURCE
endif endif
@ -138,7 +139,7 @@ endef
ifeq ($(BUILD_VARIANT),libncursesw) ifeq ($(BUILD_VARIANT),libncursesw)
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/ncursesw/ $(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 $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/