From f44080e13cf66d4483da03c4ab119722b435ba5c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Dec 2014 17:04:37 +0100 Subject: [PATCH] package/ncurses: fix shared-only libs For a shared-only build, do not create the symlinks to the static libraries, since they do not exist. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Reviewed-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index f54f379ba1..ec64663afd 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -47,8 +47,7 @@ ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) NCURSES_CONF_OPTS += --enable-widec NCURSES_LIB_SUFFIX = w -ifeq ($(BR2_STATIC_LIBS),y) -define NCURSES_LINK_LIBS +define NCURSES_LINK_LIBS_STATIC for lib in $(NCURSES_LIBS-y); do \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \ $(1)/usr/lib/$${lib}.a; \ @@ -56,23 +55,22 @@ define NCURSES_LINK_LIBS ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \ $(1)/usr/lib/libcurses.a endef -else -define NCURSES_LINK_LIBS + +define NCURSES_LINK_LIBS_SHARED for lib in $(NCURSES_LIBS-y); do \ - ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \ - $(1)/usr/lib/$${lib}.a; \ ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \ $(1)/usr/lib/$${lib}.so; \ done - ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \ - $(1)/usr/lib/libcurses.a ln -sf libncurses$(NCURSES_LIB_SUFFIX).so \ $(1)/usr/lib/libcurses.so endef -endif -NCURSES_LINK_TARGET_LIBS = $(call NCURSES_LINK_LIBS, $(TARGET_DIR)) -NCURSES_LINK_STAGING_LIBS = $(call NCURSES_LINK_LIBS, $(STAGING_DIR)) +NCURSES_LINK_TARGET_LIBS = \ + $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(TARGET_DIR))) \ + $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(TARGET_DIR))) +NCURSES_LINK_STAGING_LIBS = \ + $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC,$(STAGING_DIR))) \ + $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED,$(STAGING_DIR))) NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS -- 2.30.2