From patchwork Wed Nov 26 17:27:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 415191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 48D681401AA for ; Thu, 27 Nov 2014 04:27:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C2B3D91AEE; Wed, 26 Nov 2014 17:27:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RO+F1PaTJ3Gz; Wed, 26 Nov 2014 17:27:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 32E1F91ADD; Wed, 26 Nov 2014 17:27:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6EEB51C244D for ; Wed, 26 Nov 2014 17:27:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6977391ADD for ; Wed, 26 Nov 2014 17:27:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Oru90dpSi4AI for ; Wed, 26 Nov 2014 17:27:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6ADA691ABF for ; Wed, 26 Nov 2014 17:27:44 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 4FC654407A0; Wed, 26 Nov 2014 19:27:40 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Wed, 26 Nov 2014 19:27:22 +0200 Message-Id: <4112e251a7a4b3513c66ff30ac2f502b0aa2541c.1417022842.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.1.3 Subject: [Buildroot] [PATCH] libnspr: fix static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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" --- package/libnspr/libnspr.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index c071d8591fbd..1930870a5108 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