package/ncurses: fix shared-only libs
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 14 Dec 2014 16:04:37 +0000 (17:04 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 15 Dec 2014 21:11:43 +0000 (22:11 +0100)
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" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/ncurses/ncurses.mk

index f54f379ba181f53e6ec8f68c104fed156c6f3c60..ec64663afdca41c892cfd0298414971ddd2f2bdd 100644 (file)
@@ -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