Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ncurses: package only versioned shared objects

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2019-01-22 08:41:21 +01:00
parent 166b335e6e
commit 5a89eea8e4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package/libs/ncurses/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ncurses PKG_NAME:=ncurses
PKG_VERSION:=6.1 PKG_VERSION:=6.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -127,8 +127,10 @@ endef
define Package/libncurses/install define Package/libncurses/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
for lib in ncurses panel menu form; do \ for lib in ncurses panel menu form; do \
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$$$${lib}w.so* $(1)/usr/lib/; \ $(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; \ for so in $(1)/usr/lib/lib$$$${lib}w.so.*; do \
ln -s $$$${so##*/} $$$${so%w.so*}.so$$$${so##*w.so}; \
done; \
done done
endef endef
@ -146,7 +148,9 @@ endef
define Build/InstallDev define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)
for lib in ncurses panel menu form; do \ 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 done
ln -s . $(1)/usr/include/ncursesw ln -s . $(1)/usr/include/ncursesw
$(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a $(TARGET_CROSS)ar rc $(1)/usr/lib/libtinfo.a