#
-# Copyright (C) 2006-2014 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.
include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses
-PKG_VERSION:=5.9
+PKG_VERSION:=6.2
PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/ncurses
-PKG_MD5SUM:=8cb9c412e5f2d96bc6f459aa8c6282a1
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_HASH:=30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
-define Package/libncurses
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=Terminal handling library
- URL:=http://www.gnu.org/software/ncurses/
- DEPENDS:= +terminfo
- VARIANT:=libncurses
-endef
-
define Package/terminfo
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Terminal Info Database (ncurses)
URL:=http://www.gnu.org/software/ncurses/
- VARIANT:=libncurses
endef
-define Package/libncursesw
+define Package/libncurses
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Terminal handling library (Unicode)
URL:=http://www.gnu.org/software/ncurses/
- VARIANT:=libncursesw
+ PROVIDES:=libncursesw
+ DEPENDS:= +terminfo
+ ABI_VERSION:=6
+endef
+
+define Package/libncurses-dev
+ SECTION:=devel
+ CATEGORY:=Development
+ SUBMENU:=Libraries
+ DEPENDS:=zlib
+ TITLE:=Development files for the ncurses library
endef
TARGET_CFLAGS += $(FPIC)
--enable-echo \
--enable-const \
--enable-overwrite \
+ --enable-pc-files \
--disable-rpath \
--without-ada \
--without-debug \
--with-normal \
--with-shared \
--with-terminfo-dirs=/usr/share/terminfo \
- --with-default-terminfo-dir=/usr/share/terminfo
+ --with-default-terminfo-dir=/usr/share/terminfo \
+ --with-pkg-config-libdir=/usr/lib/pkgconfig \
+ --enable-widec \
+ --with-build-cppflags=-D_GNU_SOURCE
+
+CONFIGURE_VARS += \
+ cf_try_fPIC=no
+
+HOST_CFLAGS += $(HOST_FPIC)
HOST_CONFIGURE_ARGS += \
--without-cxx \
--with-terminfo=/usr/share/terminfo.db
endif
-ifeq ($(BUILD_VARIANT),libncursesw)
- CONFIGURE_ARGS += \
- --enable-widec \
- --with-build-cppflags=-D_GNU_SOURCE
-endif
-
MAKE_FLAGS += \
BUILD_CC="$(HOSTCC)" \
HOSTCC="$(HOSTCC)" \
HOSTCCFLAGS="" \
+ PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig \
libs
define Build/Install/Default
define Package/libncurses/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
+ for lib in ncurses panel menu form; do \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so.* $(1)/usr/lib/; \
+ for so in $(1)/usr/lib/lib$$$${lib}w.so.*; do \
+ ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
+ done; \
+ done
endef
-define Package/libncursesw/install
+define Package/libncurses-dev/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.a $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
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/
-
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/
-
- $(INSTALL_DIR) $(1)/usr/bin $(2)/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)
+ for lib in ncurses panel menu form; do \
+ for so in $(1)/usr/lib/lib$$$${lib}w.so*; do \
+ ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
+ done; \
+ done
+ ln -s . $(1)/usr/include/ncursesw
+ $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a
+ $(INSTALL_DIR) $(2)/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw6-config $(2)/bin/
$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \
- $(2)/bin/ncursesw5-config
- $(LN) $(2)/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
-endef
-else
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
-
- $(INSTALL_DIR) $(1)/usr/bin $(2)/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncurses5-config $(2)/bin/
- $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
- $(2)/bin/ncurses5-config
- $(LN) $(2)/bin/ncurses5-config $(1)/usr/bin/ncurses5-config
+ $(2)/bin/ncursesw6-config
+ ln -sf $(STAGING_DIR)/host/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config
endef
-endif
-
define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) libs
$(MAKE) -C $(HOST_BUILD_DIR)/progs tic
endef
-define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/progs/tic $(STAGING_DIR_HOST)/bin/tic
-endef
-
$(eval $(call HostBuild))
$(eval $(call BuildPackage,terminfo))
$(eval $(call BuildPackage,libncurses))
-$(eval $(call BuildPackage,libncursesw))
+$(eval $(call BuildPackage,libncurses-dev))