298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

libjson-c: bump version

Browse Source
This commit is contained in:
LEAN-ESX 2019-10-27 09:05:05 -07:00
parent 23b294857d
commit 438f06ab11
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/lean/v2ray/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray PKG_NAME:=v2ray
PKG_VERSION:=4.20 PKG_VERSION:=4.20
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -41,15 +41,13 @@ ifeq ($(ARCH),i386)
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
PKG_ARCH_V2RAY:=arm PKG_ARCH_V2RAY:=arm
ifneq ($(BOARD),bcm53xx) ifneq ($(BOARD),bcm53xx) or ($(BOARD),kirkwood) or ($(BOARD),bcm2708)
V2RAY_BIN:=v2ray_armv7 V2RAY_BIN:=v2ray_armv7
endif endif
ifeq ($(BOARD),kirkwood)
V2RAY_BIN:=v2ray
endif
endif endif
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
PKG_ARCH_V2RAY:=arm64 PKG_ARCH_V2RAY:=arm64
V2RAY_BIN:=v2ray
endif endif
define Build/Prepare define Build/Prepare

7
package/libs/libjson-c/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=json-c PKG_NAME:=json-c
PKG_VERSION:=0.12.1 PKG_VERSION:=0.13.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
PKG_HASH:=5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291 PKG_HASH:=94a26340c0785fcff4f46ff38609cf84ebcd670df0c8efd75d039cc951d80132
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
@ -38,6 +38,7 @@ define Package/libjson-c
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=javascript object notation TITLE:=javascript object notation
URL:=https://json-c.github.io/json-c/ URL:=https://json-c.github.io/json-c/
ABI_VERSION:=4
endef endef
define Package/libjson-c/description define Package/libjson-c/description

31
package/libs/libjson-c/patches/000-libm.patch
View File

@ -1,8 +1,8 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -43,12 +43,6 @@ @@ -76,12 +76,6 @@ AC_FUNC_VPRINTF
AC_FUNC_MALLOC AC_FUNC_MEMCMP
AC_FUNC_REALLOC AC_CHECK_FUNCS([realloc])
AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp setlocale) AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp setlocale)
-AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]]) -AC_CHECK_DECLS([INFINITY], [], [], [[#include <math.h>]])
-AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]]) -AC_CHECK_DECLS([nan], [], [], [[#include <math.h>]])
@ -10,16 +10,16 @@
-AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]]) -AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]])
-AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]]) -AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]])
-AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]]) -AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]])
AC_MSG_CHECKING(for GCC atomic builtins)
#check if .section.gnu.warning accepts long strings (for __warn_references) AC_LINK_IFELSE(
AC_LANG_PUSH([C]) [
--- a/math_compat.h --- a/math_compat.h
+++ b/math_compat.h +++ b/math_compat.h
@@ -1,28 +1,9 @@ @@ -6,31 +6,9 @@
#ifndef __math_compat_h * @brief Do not use, json-c internal, may be changed or removed at any time.
#define __math_compat_h */
-/* Define isnan and isinf on Windows/MSVC */ -/* Define isnan, isinf, infinity and nan on Windows/MSVC */
- -
-#ifndef HAVE_DECL_ISNAN -#ifndef HAVE_DECL_ISNAN
-# ifdef HAVE_DECL__ISNAN -# ifdef HAVE_DECL__ISNAN
@ -35,12 +35,15 @@
-# endif -# endif
-#endif -#endif
- -
-#ifndef HAVE_DECL_NAN -#ifndef HAVE_DECL_INFINITY
-#error This platform does not have nan() -#include <float.h>
-#define INFINITY (DBL_MAX + DBL_MAX)
-#define HAVE_DECL_INFINITY
-#endif -#endif
- -
-#ifndef HAVE_DECL_INFINITY -#ifndef HAVE_DECL_NAN
-#error This platform does not have INFINITY -#define NAN (INFINITY - INFINITY)
-#define HAVE_DECL_NAN
-#endif -#endif
+#undef isnan +#undef isnan
+#define isnan(x) __builtin_isnan(x) +#define isnan(x) __builtin_isnan(x)