ncurses: Do not pass both -fPIC and -fpic

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

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 60a8a176df3c2eb05aa95238f96660b5976806a1..e22eb2b8935dd9a24ecbe5736a51a9d66791f1d2 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:=6.0
-PKG_RELEASE:=1
+PKG_VERSION:=6.1
+PKG_RELEASE:=5
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/ncurses
-PKG_HASH:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260
+PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_HASH:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=README
@@ -41,7 +40,15 @@ define Package/libncurses
   URL:=http://www.gnu.org/software/ncurses/
   PROVIDES:=libncursesw
   DEPENDS:= +terminfo
-  ABI_VERSION:=$(PKG_VERSION)
+  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)
@@ -68,6 +75,11 @@ CONFIGURE_ARGS += \
        --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 \
@@ -119,15 +131,30 @@ endef
 define Package/libncurses/install
        $(INSTALL_DIR) $(1)/usr/lib
        for lib in ncurses panel menu form; do \
-               $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so* $(1)/usr/lib/; \
-               ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+               $(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/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/*.a $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
+endef
+
 define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
        for lib in ncurses panel menu form; do \
-               ln -s lib$$$${lib}w.so $(1)/usr/lib/lib$$$${lib}.so; \
+               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
@@ -143,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,libncurses))
+$(eval $(call BuildPackage,libncurses-dev))