package/ncurses: change AR options to fix reproducible builds

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

diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 95f05fa7115f6cf5b242a0bf2b6f94de0f671bc0..8c961f30b23d863ef71bebd629c3c3f25741df91 100644 (file)
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ncurses
 PKG_VERSION:=6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -41,7 +41,7 @@ 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
@@ -76,6 +76,8 @@ CONFIGURE_ARGS += \
        --enable-widec \
        --with-build-cppflags=-D_GNU_SOURCE
 
+HOST_CFLAGS += $(HOST_FPIC)
+
 HOST_CONFIGURE_ARGS += \
        --without-cxx \
        --without-cxx-binding \
@@ -127,8 +129,10 @@ 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
 
@@ -146,7 +150,9 @@ 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
@@ -162,10 +168,6 @@ 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))