Skip to content

Commit

Permalink
A
Browse files Browse the repository at this point in the history
A
A
A
A
A
A
 * add new library - [http://www.digip.org/jansson/ jansson] (by [http://www.ip-phone-forum.de/showthread.php?t=281667&s=a1c91648aaa6eec71a0de08d5086fd5a merov] + fixes by me)


git-svn-id: file:///var/svn/freetz/trunk@13414 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information
er13 committed Oct 3, 2015
1 parent 199686f commit f879fab
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -46,6 +46,7 @@ Latest changes:
* ISC dhcp 4.2.5-P1
* E-MailRelay 1.9
* iksemel 1.5-git
* jansson 2.7
* libavmacl2 (taken from AVM's 7490.06.01 open-source package)
* libcap 2.24
* libgsm-1.0.13
Expand Down
1 change: 1 addition & 0 deletions make/libs/Config.in
Expand Up @@ -206,6 +206,7 @@ endmenu ### "USB & FTDI"
menu "Web and WebDAV"

source make/curl/Config.in.libs
source make/libs/jansson/Config.in
source make/js/Config.in.libs
source make/libs/neon/Config.in
source make/libs/serf/Config.in
Expand Down
1 change: 1 addition & 0 deletions make/libs/external.in
Expand Up @@ -42,6 +42,7 @@ source make/iconv/external.in.libs
source make/libs/libid3tag/external.in
source make/libs/iksemel/external.in
source make/libs/gettext/external.in
source make/libs/jansson/external.in
source make/libs/jpeg/external.in
source make/js/external.in.libs
source make/libs/leptonica/external.in
Expand Down
5 changes: 5 additions & 0 deletions make/libs/jansson/Config.in
@@ -0,0 +1,5 @@
config FREETZ_LIB_libjansson
bool "libjansson (libjansson.so)"
default n
help
A C library for encoding, decoding and manipulating JSON data.
3 changes: 3 additions & 0 deletions make/libs/jansson/Makefile.in
@@ -0,0 +1,3 @@
ifeq ($(strip $(FREETZ_LIB_libjansson)),y)
LIBS+=jansson
endif
1 change: 1 addition & 0 deletions make/libs/jansson/external.files
@@ -0,0 +1 @@
[ "$EXTERNAL_FREETZ_LIB_libjansson" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libjansson.so.4.7.0"
7 changes: 7 additions & 0 deletions make/libs/jansson/external.in
@@ -0,0 +1,7 @@
config EXTERNAL_FREETZ_LIB_libjansson
depends on EXTERNAL_ENABLED && FREETZ_LIB_libjansson
bool "libjansson"
default n
help
externals the following file(s):
/usr/lib/freetz/libjansson.so.4.7.0
47 changes: 47 additions & 0 deletions make/libs/jansson/jansson.mk
@@ -0,0 +1,47 @@
$(call PKG_INIT_LIB, 2.7)
$(PKG)_LIB_VERSION:=4.7.0
$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz
$(PKG)_SOURCE_MD5:=3a106a465bbb77637550b422f5b262ef
$(PKG)_SITE:=http://www.digip.org/jansson/releases

$(PKG)_LIBNAME:=lib$(pkg).so.$($(PKG)_LIB_VERSION)
$(PKG)_BINARY:=$($(PKG)_DIR)/src/.libs/$($(PKG)_LIBNAME)
$(PKG)_STAGING_BINARY:=$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/$($(PKG)_LIBNAME)
$(PKG)_TARGET_BINARY:=$($(PKG)_TARGET_DIR)/$($(PKG)_LIBNAME)

$(PKG)_CONFIGURE_OPTIONS += --enable-shared
$(PKG)_CONFIGURE_OPTIONS += --enable-static

$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
$(PKG_CONFIGURED_CONFIGURE)

$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
$(SUBMAKE) -C $(JANSSON_DIR)

$($(PKG)_STAGING_BINARY): $($(PKG)_BINARY)
$(SUBMAKE) -C $(JANSSON_DIR) \
DESTDIR="$(TARGET_TOOLCHAIN_STAGING_DIR)" \
install
$(call PKG_FIX_LIBTOOL_LA,prefix exec_prefix libdir) \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libjansson.la \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/jansson.pc

$($(PKG)_TARGET_BINARY): $($(PKG)_STAGING_BINARY)
$(INSTALL_LIBRARY_STRIP)

$(pkg): $($(PKG)_STAGING_BINARY)

$(pkg)-precompiled: $($(PKG)_TARGET_BINARY)

$(pkg)-clean:
-$(SUBMAKE) -C $(JANSSON_DIR) clean
$(RM) \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/libjansson* \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/jansson*.h \
$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib/pkgconfig/jansson.pc

$(pkg)-uninstall:
$(RM) $(JANSSON_TARGET_DIR)/libjansson.so*

$(PKG_FINISH)

0 comments on commit f879fab

Please sign in to comment.