From 05aa5b49739e528b85fcf3efbe8948a3db2ff09d Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 26 Nov 2014 19:27:22 +0200 Subject: [PATCH] libnspr: fix static build Disable shared library in a static build. Fixes: http://autobuild.buildroot.net/results/6ff/6ffae151ec3eaca175923ab860cf42167871164c/ http://autobuild.buildroot.net/results/cab/cab19721c43b3256dd51ae511016bc9ea440512a/ Signed-off-by: Baruch Siach Tested-by: Vicente Olivert Riera Tested-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/libnspr/libnspr.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index c071d8591f..1930870a51 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -21,6 +21,12 @@ LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 +ifeq ($(BR2_PREFER_STATIC_LIB),y) +LIBNSPR_MAKE_OPTS = SHARED_LIBRARY= +LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install +LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install +endif + ifeq ($(BR2_arm),y) ifeq ($(BR2_ARM_CPU_HAS_THUMB2),y) LIBNSPR_CONF_OPTS += --enable-thumb2 -- 2.30.2