projects
/
buildroot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94319c6
)
libnspr: fix static build
author
Baruch Siach
<baruch@tkos.co.il>
Wed, 26 Nov 2014 17:27:22 +0000
(19:27 +0200)
committer
Peter Korsgaard
<peter@korsgaard.com>
Wed, 26 Nov 2014 22:20:03 +0000
(23:20 +0100)
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 <baruch@tkos.co.il>
Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/libnspr/libnspr.mk
patch
|
blob
|
history
diff --git
a/package/libnspr/libnspr.mk
b/package/libnspr/libnspr.mk
index c071d8591fbd255b5cb1ec609b4b5059a32a0ef5..1930870a5108f6a88a51a08a413820c4a6aaf5cc 100644
(file)
--- 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