ncurses: update to 6.2

[openwrt/staging/jow.git] / package / libs / ncurses / Makefile

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index c5b130ad2c3618b959cc106cd0c77720b3e9a259..cc1e960a0cb5391fe3372d23fd2d4a5a2ba08d1d 100644 (file)
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -8,13 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
-PKG_VERSION:=5.9
-PKG_RELEASE:=3
+PKG_VERSION:=6.2
+PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(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
@@ -34,13 +33,22 @@ define Package/terminfo
   URL:=http://www.gnu.org/software/ncurses/
 endef
 
-define Package/libncursesw
+define Package/libncurses
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Terminal handling library (Unicode)
   URL:=http://www.gnu.org/software/ncurses/
-  PROVIDES:=libncurses
+  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)
@@ -49,6 +57,7 @@ CONFIGURE_ARGS += \
        --enable-echo \
        --enable-const \
        --enable-overwrite \
+       --enable-pc-files \
        --disable-rpath \
        --without-ada \
        --without-debug \
@@ -62,9 +71,15 @@ CONFIGURE_ARGS += \
        --with-shared \
        --with-terminfo-dirs=/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 \
        --without-cxx-binding \
@@ -85,6 +100,7 @@ MAKE_FLAGS += \
        BUILD_CC="$(HOSTCC)" \
        HOSTCC="$(HOSTCC)" \
        HOSTCCFLAGS="" \
+       PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig \
        libs
 
 define Build/Install/Default
@@ -112,23 +128,41 @@ ifneq ($(HOST_OS),FreeBSD)
 endif
 endef
 
-define Package/libncursesw/install
+define Package/libncurses/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.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 Build/InstallDev
+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.{a,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
 
-       $(INSTALL_DIR) $(1)/usr/bin $(2)/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw5-config $(2)/bin/
+define Build/InstallDev
+       $(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 -sf $(STAGING_DIR)/host/bin/ncursesw5-config $(1)/usr/bin/ncursesw5-config
+               $(2)/bin/ncursesw6-config
+       ln -sf $(STAGING_DIR)/host/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config
 endef
 
 define Host/Compile
@@ -136,10 +170,7 @@ define Host/Compile
        $(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,libncursesw))
+$(eval $(call BuildPackage,libncurses))
+$(eval $(call BuildPackage,libncurses-dev))