diff --git a/package/lean/v2ray/Makefile b/package/lean/v2ray/Makefile index fb4c2923e..138ff75c9 100644 --- a/package/lean/v2ray/Makefile +++ b/package/lean/v2ray/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray PKG_VERSION:=4.20 -PKG_RELEASE:=2 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -41,13 +41,15 @@ ifeq ($(ARCH),i386) endif ifeq ($(ARCH),arm) PKG_ARCH_V2RAY:=arm - ifneq ($(BOARD),bcm53xx) or ($(BOARD),kirkwood) or ($(BOARD),bcm2708) + ifneq ($(BOARD),bcm53xx) V2RAY_BIN:=v2ray_armv7 endif + ifeq ($(BOARD),kirkwood) + V2RAY_BIN:=v2ray + endif endif ifeq ($(ARCH),aarch64) PKG_ARCH_V2RAY:=arm64 - V2RAY_BIN:=v2ray endif define Build/Prepare diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile index b61d99cc9..118d618a6 100644 --- a/package/libs/libjson-c/Makefile +++ b/package/libs/libjson-c/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=json-c -PKG_VERSION:=0.13.1 -PKG_RELEASE:=1 +PKG_VERSION:=0.12.1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/ -PKG_HASH:=94a26340c0785fcff4f46ff38609cf84ebcd670df0c8efd75d039cc951d80132 +PKG_HASH:=5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) @@ -38,7 +38,6 @@ define Package/libjson-c CATEGORY:=Libraries TITLE:=javascript object notation URL:=https://json-c.github.io/json-c/ - ABI_VERSION:=4 endef define Package/libjson-c/description diff --git a/package/libs/libjson-c/patches/000-libm.patch b/package/libs/libjson-c/patches/000-libm.patch index de98e35d4..45adb0597 100644 --- a/package/libs/libjson-c/patches/000-libm.patch +++ b/package/libs/libjson-c/patches/000-libm.patch @@ -1,8 +1,8 @@ --- a/configure.ac +++ b/configure.ac -@@ -76,12 +76,6 @@ AC_FUNC_VPRINTF - AC_FUNC_MEMCMP - AC_CHECK_FUNCS([realloc]) +@@ -43,12 +43,6 @@ + AC_FUNC_MALLOC + AC_FUNC_REALLOC AC_CHECK_FUNCS(strcasecmp strdup strerror snprintf vsnprintf vasprintf open vsyslog strncasecmp setlocale) -AC_CHECK_DECLS([INFINITY], [], [], [[#include ]]) -AC_CHECK_DECLS([nan], [], [], [[#include ]]) @@ -10,16 +10,16 @@ -AC_CHECK_DECLS([isinf], [], [], [[#include ]]) -AC_CHECK_DECLS([_isnan], [], [], [[#include ]]) -AC_CHECK_DECLS([_finite], [], [], [[#include ]]) - AC_MSG_CHECKING(for GCC atomic builtins) - AC_LINK_IFELSE( - [ + + #check if .section.gnu.warning accepts long strings (for __warn_references) + AC_LANG_PUSH([C]) --- a/math_compat.h +++ b/math_compat.h -@@ -6,31 +6,9 @@ - * @brief Do not use, json-c internal, may be changed or removed at any time. - */ +@@ -1,28 +1,9 @@ + #ifndef __math_compat_h + #define __math_compat_h --/* Define isnan, isinf, infinity and nan on Windows/MSVC */ +-/* Define isnan and isinf on Windows/MSVC */ - -#ifndef HAVE_DECL_ISNAN -# ifdef HAVE_DECL__ISNAN @@ -35,15 +35,12 @@ -# endif -#endif - --#ifndef HAVE_DECL_INFINITY --#include --#define INFINITY (DBL_MAX + DBL_MAX) --#define HAVE_DECL_INFINITY +-#ifndef HAVE_DECL_NAN +-#error This platform does not have nan() -#endif - --#ifndef HAVE_DECL_NAN --#define NAN (INFINITY - INFINITY) --#define HAVE_DECL_NAN +-#ifndef HAVE_DECL_INFINITY +-#error This platform does not have INFINITY -#endif +#undef isnan +#define isnan(x) __builtin_isnan(x)