package/ncurses: trim leading 'lib' from definition of libs to install

Currently, ncurses creates symlinks from the non-'w' variants to the
equivalent 'w' variant, but forgets to do so for pkg-config files.

To be able to share the same list between the libraries and the
pkg-config files to symlink, just trim the 'lib' prefix of libraries in
the definition, and just add it back at the time we need it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-12-14 17:04:39 +01:00 committed by Peter Korsgaard
parent 43fa88ae90
commit 19569281dd

View File

@ -43,17 +43,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
NCURSES_CONF_OPTS += --with-shared --with-normal NCURSES_CONF_OPTS += --with-shared --with-normal
endif endif
NCURSES_LIBS-y = libncurses NCURSES_LIBS-y = ncurses
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += libmenu NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_MENU) += menu
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += libpanel NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_PANEL) += panel
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += form
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
NCURSES_CONF_OPTS += --enable-widec NCURSES_CONF_OPTS += --enable-widec
NCURSES_LIB_SUFFIX = w NCURSES_LIB_SUFFIX = w
define NCURSES_LINK_LIBS_STATIC define NCURSES_LINK_LIBS_STATIC
for lib in $(NCURSES_LIBS-y); do \ for lib in $(NCURSES_LIBS-y:%=lib%); do \
ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \
$(1)/usr/lib/$${lib}.a; \ $(1)/usr/lib/$${lib}.a; \
done done
@ -62,7 +62,7 @@ define NCURSES_LINK_LIBS_STATIC
endef endef
define NCURSES_LINK_LIBS_SHARED define NCURSES_LINK_LIBS_SHARED
for lib in $(NCURSES_LIBS-y); do \ for lib in $(NCURSES_LIBS-y:%=lib%); do \
ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \
$(1)/usr/lib/$${lib}.so; \ $(1)/usr/lib/$${lib}.so; \
done done
@ -95,7 +95,7 @@ endef
ifneq ($(BR2_STATIC_LIBS),y) ifneq ($(BR2_STATIC_LIBS),y)
define NCURSES_INSTALL_TARGET_LIBS define NCURSES_INSTALL_TARGET_LIBS
for lib in $(NCURSES_LIBS-y); do \ for lib in $(NCURSES_LIBS-y:%=lib%); do \
cp -dpf $(NCURSES_DIR)/lib/$${lib}$(NCURSES_LIB_SUFFIX).so* \ cp -dpf $(NCURSES_DIR)/lib/$${lib}$(NCURSES_LIB_SUFFIX).so* \
$(TARGET_DIR)/usr/lib/; \ $(TARGET_DIR)/usr/lib/; \
done done