diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 904d3c1551ff6ba0f4651255064fa8cebbb2d838..e22eb2b8935dd9a24ecbe5736a51a9d66791f1d2 100644 --- a/package/libs/ncurses/Makefile +++ b/package/libs/ncurses/Makefile @@ -9,9 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=6.1 -PKG_RELEASE:=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/$(PKG_NAME) PKG_HASH:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 @@ -41,7 +40,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 +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 \ @@ -127,8 +131,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 +152,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 diff --git a/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch new file mode 100644 index 0000000000000000000000000000000000000000..d4c8f1170399f5e0c7202b1a337f284c2631f30a --- /dev/null +++ b/package/libs/ncurses/patches/103-ncurses-ar-determinism.patch @@ -0,0 +1,22 @@ +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -451,7 +451,7 @@ AC_REQUIRE([CF_PROG_AR]) + + AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice +--- a/configure ++++ b/configure +@@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; t + else + + cf_cv_ar_flags=unknown +- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv ++ for cf_ar_flags in -curvD -curv curv -crv crv -cqv cqv -rv rv + do + + # check if $ARFLAGS already contains this choice