diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-22 08:41:21 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-01-22 08:49:36 +0100 |
| commit | 5a89eea8e49f576f0d5c7aaaaba1929c11589fdc (patch) | |
| tree | 620b3d8ab0c9befc383050b29f63ec3049003404 | |
| parent | 166b335e6eeabcbcd0a3f817e210a5166dcdb202 (diff) | |
| download | upstream-5a89eea8e49f576f0d5c7aaaaba1929c11589fdc.tar.gz upstream-5a89eea8e49f576f0d5c7aaaaba1929c11589fdc.tar.bz2 upstream-5a89eea8e49f576f0d5c7aaaaba1929c11589fdc.zip | |
ncurses: package only versioned shared objects
Also fix the libxxxw.so* -> libxxx.so* linking to actually work, the
prevsious code failed to properly symlink the versioned .so files.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | package/libs/ncurses/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile index 5be65c2f08..5d1b28d57d 100644 --- 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:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -127,8 +127,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 +148,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 |