Changeset 47853


Ignore:
Timestamp:
2015-12-11T16:06:01+01:00 (2 years ago)
Author:
blogic
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/libs/ncurses/Makefile

    r45878 r47853  
    11# 
    2 # Copyright (C) 2006-2013 OpenWrt.org 
     2# Copyright (C) 2006-2015 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=ncurses 
    1111PKG_VERSION:=5.9 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
     
    9292        CONFIGURE_ARGS += \ 
    9393                --enable-widec \ 
     94                --includedir="/usr/include/ncursesw" \ 
    9495                --with-build-cppflags=-D_GNU_SOURCE 
    9596endif 
     
    139140define Build/InstallDev 
    140141        $(INSTALL_DIR) $(1)/usr/include/ncursesw/ 
    141         $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/ 
     142        $(CP) $(PKG_INSTALL_DIR)/usr/include/ncursesw/*.h $(1)/usr/include/ncursesw/ 
    142143 
    143144        $(INSTALL_DIR) $(1)/usr/lib 
Note: See TracChangeset for help on using the changeset viewer.