Commit 26406543 authored by Simon Dawson's avatar Simon Dawson Committed by Peter Korsgaard
Browse files

libjson: new package 



[Peter: fix static builds, don't run ldconfig, disable assert checks]
Signed-off-by: default avatarSimon Dawson <spdawson@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 8f434ff2

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ source "package/ezxml/Config.in" 
source "package/jansson/Config.in"

source "package/json-c/Config.in"

source "package/json-glib/Config.in"

source "package/libjson/Config.in"

source "package/libroxml/Config.in"

source "package/libxml-parser-perl/Config.in"

source "package/libxml2/Config.in"

package/libjson/Config.in

0 → 100644
+11 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBJSON

	bool "libjson"

	depends on BR2_INSTALL_LIBSTDCPP

	help

	  A JSON reader and writer which is super-efficient and usually

	  runs circles around other JSON libraries.



	  http://sourceforge.net/projects/libjson/



comment "libjson requires a toolchain with C++ support"

	depends on !BR2_INSTALL_LIBSTDCPP

package/libjson/libjson-0001-fix-broken-makefile.patch

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Fix the broken libjson makefile.



Signed-off-by: Simon Dawson <spdawson@gmail.com>



diff -Nurp a/makefile b/makefile

--- a/makefile	2012-05-30 10:15:42.000000000 +0100

+++ b/makefile	2013-03-27 18:45:34.814670534 +0000

@@ -170,7 +170,7 @@ include_path     = $(prefix)/$(includedi

 # Usage check

 ifdef CXXFLAGS

 ifdef BUILD_TYPE

-	$(error CXXFLAGS and BUILD_TYPE are mutually exclusive)

+$(error CXXFLAGS and BUILD_TYPE are mutually exclusive)

 endif

 endif

package/libjson/libjson.mk

0 → 100644
+56 −0
Original line number Diff line number Diff line 
#############################################################

#

# libjson

#

#############################################################



LIBJSON_VERSION = 7.6.1

LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson

LIBJSON_SOURCE = libjson_$(LIBJSON_VERSION).zip

LIBJSON_INSTALL_STAGING = YES

LIBJSON_LICENSE = BSD-2c

LIBJSON_LICENSE_FILES = License.txt



LIBJSON_MAKE_OPT = BUILD_TYPE= SHARED=$(if $(BR2_PREFER_STATIC_LIB),0,1) \

	CXXFLAGS="$(TARGET_CXXFLAGS) -DNDEBUG"



define LIBJSON_EXTRACT_CMDS

	unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)

	mv $(@D)/libjson/* $(@D)

	$(RM) -r $(@D)/libjson

	$(SED) '/ldconfig/d' $(@D)/makefile

endef



define LIBJSON_BUILD_CMDS

	mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \

		$(@D)/_internal/Source/Dependencies

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LIBJSON_MAKE_OPT) -C $(@D)

endef



define LIBJSON_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)

endef



define LIBJSON_UNINSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr uninstall -C $(@D)

endef



define LIBJSON_INSTALL_STAGING_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)

endef



define LIBJSON_UNINSTALL_STAGING_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \

		$(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr uninstall -C $(@D)

endef



define LIBJSON_CLEAN_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LIBJSON_MAKE_OPT) \

		clean -C $(@D)

endef



$(eval $(generic-package))