Browse Source

json-c: update to 0.13

Waldemar Brodkorb 6 years ago
parent
commit
82dcea3574
2 changed files with 5 additions and 17 deletions
  1. 5 6
      package/json-c/Makefile
  2. 0 11
      package/json-c/patches/patch-Makefile_in

+ 5 - 6
package/json-c/Makefile

@@ -4,21 +4,20 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		json-c
-PKG_VERSION:=		0.12.1
+PKG_VERSION:=		0.13
 PKG_RELEASE:=		1
-PKG_HASH:=		2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123
+PKG_HASH:=		0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d
 PKG_DESCR:=		json library
 PKG_SECTION:=		libs/data
 PKG_URL:=		https://github.com/json-c/json-c/wiki
 PKG_SITES:=		https://s3.amazonaws.com/json-c_releases/releases/
 PKG_OPTS:=		dev
-PKG_NOPARALLEL:=	1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
 			ac_cv_func_realloc_0_nonnull=yes
@@ -28,4 +27,4 @@ json-c-install:
 	$(CP) $(WRKINST)/usr/lib/libjson*.so* \
 		$(IDIR_JSON_C)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 11
package/json-c/patches/patch-Makefile_in

@@ -1,11 +0,0 @@
---- json-c-0.12.1.orig/Makefile.in	2016-06-07 05:36:51.000000000 +0200
-+++ json-c-0.12.1/Makefile.in	2017-06-06 02:16:08.632880056 +0200
-@@ -389,7 +389,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
- EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
- SUBDIRS = . tests
- lib_LTLIBRARIES = libjson-c.la