Skip to contentSkip to conversation

package/benejson: only buid static/shared as needed

PATCH New Yann E. MORIN 2 participants 2 messages Feb 1, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/benejson: only buid static/shared as needed

Fixes:

    http://autobuild.buildroot.org/results/56a/56a721885c890f3d62bf9e13d712767e66937c51/
    http://autobuild.buildroot.org/results/7c5/7c54dce4801a53bec378b422edfa42dfa990eabe/
    [...]

Patch-from: Alex Suykov <[email protected]>

---
 package/benejson/benejson.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
package/benejson/benejson.mk +9 -5
index 2b8d09d..680e5b5 100644
@@ -20,13 +20,10 @@ endef
 BENEJSON_POST_PATCH_HOOKS += BENEJSON_DISABLE_WCHAR
 endif
 
-define BENEJSON_BUILD_CMDS
-	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
-		$(SCONS))
-endef
+BENEJSON_SCONS_TARGETS = include
 
 ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+BENEJSON_SCONS_TARGETS += lib/libbenejson.a
 define BENEJSON_INSTALL_STATIC_LIB
 	$(INSTALL) -D -m 0644 $(@D)/lib/libbenejson.a \
 		$(1)/usr/lib/libbenejson.a
@@ -34,12 +31,19 @@ endef
 endif # Static enabled
 
 ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+BENEJSON_SCONS_TARGETS += lib/libbenejson.so
 define BENEJSON_INSTALL_SHARED_LIB
 	$(INSTALL) -D -m 0644 $(@D)/lib/libbenejson.so \
 		$(1)/usr/lib/libbenejson.so
 endef
 endif # Shared enabled
 
+define BENEJSON_BUILD_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
+		$(SCONS) $(BENEJSON_SCONS_TARGETS))
+endef
+
 define BENEJSON_INSTALL_STAGING_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/include/benejson/benejson.h \
 		$(STAGING_DIR)/usr/include/benejson/benejson.h; \
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/benejson: only buid static/shared as needed

Dear Yann E. MORIN,

Quoted 10 lines · Yann E. MORIN

Fixes:

    http://autobuild.buildroot.org/results/56a/56a721885c890f3d62bf9e13d712767e66937c51/
    http://autobuild.buildroot.org/results/7c5/7c54dce4801a53bec378b422edfa42dfa990eabe/
    [...]

Patch-from: Alex Suykov <[email protected]>

---
 package/benejson/benejson.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com