Re: [LEDE-DEV] [PATCH] libjson-c: Update to 0.13

2018-04-03 Thread Alexandru Ardelean 
On Tue, Apr 3, 2018 at 4:33 PM, Karl Palsson  wrote:
>
> Alexandru Ardelean  wrote:
>> On Sat, Mar 31, 2018 at 9:45 AM, Hans Dedecker
>>  wrote:
>> > On Sat, Mar 31, 2018 at 12:25 AM, Rosen Penev  wrote:
>> >> From: Daniel Engberg 
>> >>
>> >> Update (lib)json-c to 0.13
>> > What are the changes?
>> > Is there any size increase ?
>> > Please be a bit more verbose in the git commit description
>> >
>>
>> From me, this is a NAK.
>> See https://github.com/lede-project/source/pull/1575
>>
>> The size increase is reasonably big [percentage-wise +30%, even
>> though the lib is small]. 0.13 adds a few new features, but
>> nothing that is of interest to OpenWrt. The set of features in
>> 0.12 is sufficient for now.
>
> And fixes a pile of bugs, and improves performance :)

Not sure about performance, but I agree on the bugs part.

>
> Please remember that this library is heavily used by packages
> too, not just the ones in core. Yes, it's bigger, but hey, linux
> 4.14 is bigger than linux 4.9 too.

I agree on the linux 4.14 vs 4.9 size increase, but I would not use it
as an argument.
OpenWrt has also run on systems with 2 MB of flash, which is why it's
interesting to have disable flags for whatever is possible.
Or create libjson-c variants [libjson-c-tiny, libjson-c-full].
That may work for both core & packages.

>
>> What would be interesting in 0.13 or later, is to have disable
>> flags, to keep it slim. And maybe switch to cmake, since it's
>> better supported, and preferred [by various users of
>> libjson-c]. Maybe once we have the disable flags, then it would
>> be fine to upgrade.
>
> cmake better supported what? Upstream's "how to build"
> documentation doesn't even _mention_ cmake. The extended docs say
> that cmake is there for win32.

tbh, i did not check the docs about cmake;
i built libjson-c with cmake on my linux desktop a while back; not on
OpenWrt though ;
i also had to push some fixes for linux though:
https://github.com/json-c/json-c/pull/321/files
https://github.com/json-c/json-c/pull/329/files

I'd say, cmake is better supported in 0.13 vs 0.12.
But it's fine if we don't agree here :)

>
> Cheers,
> Karl P

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] libjson-c: Update to 0.13

2018-04-03 Thread Karl Palsson 

Alexandru Ardelean  wrote:
> On Sat, Mar 31, 2018 at 9:45 AM, Hans Dedecker
>  wrote:
> > On Sat, Mar 31, 2018 at 12:25 AM, Rosen Penev  wrote:
> >> From: Daniel Engberg 
> >>
> >> Update (lib)json-c to 0.13
> > What are the changes?
> > Is there any size increase ?
> > Please be a bit more verbose in the git commit description
> >
> 
> From me, this is a NAK.
> See https://github.com/lede-project/source/pull/1575
> 
> The size increase is reasonably big [percentage-wise +30%, even
> though the lib is small]. 0.13 adds a few new features, but
> nothing that is of interest to OpenWrt. The set of features in
> 0.12 is sufficient for now.

And fixes a pile of bugs, and improves performance :)

Please remember that this library is heavily used by packages
too, not just the ones in core. Yes, it's bigger, but hey, linux
4.14 is bigger than linux 4.9 too.

> What would be interesting in 0.13 or later, is to have disable
> flags, to keep it slim. And maybe switch to cmake, since it's
> better supported, and preferred [by various users of
> libjson-c]. Maybe once we have the disable flags, then it would
> be fine to upgrade.

cmake better supported what? Upstream's "how to build"
documentation doesn't even _mention_ cmake. The extended docs say
that cmake is there for win32.

Cheers,
Karl P

signature.html
Description: OpenPGP Digital Signature
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] libjson-c: Update to 0.13

2018-03-31 Thread Alexandru Ardelean 
On Sat, Mar 31, 2018 at 9:45 AM, Hans Dedecker  wrote:
> On Sat, Mar 31, 2018 at 12:25 AM, Rosen Penev  wrote:
>> From: Daniel Engberg 
>>
>> Update (lib)json-c to 0.13
> What are the changes?
> Is there any size increase ?
> Please be a bit more verbose in the git commit description
>

>From me, this is a NAK.
See https://github.com/lede-project/source/pull/1575

The size increase is reasonably big [percentage-wise +30%, even though
the lib is small].
0.13 adds a few new features, but nothing that is of interest to OpenWrt.
The set of features in 0.12 is sufficient for now.

What would be interesting in 0.13 or later, is to have disable flags,
to keep it slim.
And maybe switch to cmake, since it's better supported, and preferred
[by various users of libjson-c].
Maybe once we have the disable flags, then it would be fine to upgrade.

Thanks
Alex

> Hans
>>
>> Signed-off-by: Daniel Engberg 
>> Signed-off-by: Rosen Penev 
>> ---
>>  package/libs/libjson-c/Makefile   |  4 +--
>>  package/libs/libjson-c/patches/000-libm.patch | 50 
>> ---
>>  2 files changed, 2 insertions(+), 52 deletions(-)
>>  delete mode 100644 package/libs/libjson-c/patches/000-libm.patch
>>
>> diff --git a/package/libs/libjson-c/Makefile 
>> b/package/libs/libjson-c/Makefile
>> index eeb7870f07..72b41e9fb8 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.12.1
>> +PKG_VERSION:=0.13
>>  PKG_RELEASE:=1
>>
>>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
>>  PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
>> -PKG_HASH:=5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291
>> +PKG_HASH:=8572760646e9d23ee68f967ca62fa134a97b931665fd9af562192b7788c95a06
>>  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
>>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
>>
>> diff --git a/package/libs/libjson-c/patches/000-libm.patch 
>> b/package/libs/libjson-c/patches/000-libm.patch
>> deleted file mode 100644
>> index 45adb0597f..00
>> --- a/package/libs/libjson-c/patches/000-libm.patch
>> +++ /dev/null
>> @@ -1,50 +0,0 @@
>>  a/configure.ac
>> -+++ b/configure.ac
>> -@@ -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 ]])
>> --AC_CHECK_DECLS([isnan], [], [], [[#include ]])
>> --AC_CHECK_DECLS([isinf], [], [], [[#include ]])
>> --AC_CHECK_DECLS([_isnan], [], [], [[#include ]])
>> --AC_CHECK_DECLS([_finite], [], [], [[#include ]])
>> -
>> - #check if .section.gnu.warning accepts long strings (for __warn_references)
>> - AC_LANG_PUSH([C])
>>  a/math_compat.h
>> -+++ b/math_compat.h
>> -@@ -1,28 +1,9 @@
>> - #ifndef __math_compat_h
>> - #define __math_compat_h
>> -
>> --/* Define isnan and isinf on Windows/MSVC */
>> --
>> --#ifndef HAVE_DECL_ISNAN
>> --# ifdef HAVE_DECL__ISNAN
>> --#include 
>> --#define isnan(x) _isnan(x)
>> --# endif
>> --#endif
>> --
>> --#ifndef HAVE_DECL_ISINF
>> --# ifdef HAVE_DECL__FINITE
>> --#include 
>> --#define isinf(x) (!_finite(x))
>> --# endif
>> --#endif
>> --
>> --#ifndef HAVE_DECL_NAN
>> --#error This platform does not have nan()
>> --#endif
>> --
>> --#ifndef HAVE_DECL_INFINITY
>> --#error This platform does not have INFINITY
>> --#endif
>> -+#undef isnan
>> -+#define isnan(x) __builtin_isnan(x)
>> -+#undef isinf
>> -+#define isinf(x) __builtin_isinf(x)
>> -
>> - #endif
>> --
>> 2.16.3
>>
>>
>> ___
>> Lede-dev mailing list
>> Lede-dev@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/lede-dev
>
> ___
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] libjson-c: Update to 0.13

2018-03-31 Thread Hans Dedecker 
On Sat, Mar 31, 2018 at 12:25 AM, Rosen Penev  wrote:
> From: Daniel Engberg 
>
> Update (lib)json-c to 0.13
What are the changes?
Is there any size increase ?
Please be a bit more verbose in the git commit description

Hans
>
> Signed-off-by: Daniel Engberg 
> Signed-off-by: Rosen Penev 
> ---
>  package/libs/libjson-c/Makefile   |  4 +--
>  package/libs/libjson-c/patches/000-libm.patch | 50 
> ---
>  2 files changed, 2 insertions(+), 52 deletions(-)
>  delete mode 100644 package/libs/libjson-c/patches/000-libm.patch
>
> diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
> index eeb7870f07..72b41e9fb8 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.12.1
> +PKG_VERSION:=0.13
>  PKG_RELEASE:=1
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
>  PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
> -PKG_HASH:=5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291
> +PKG_HASH:=8572760646e9d23ee68f967ca62fa134a97b931665fd9af562192b7788c95a06
>  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
>
> diff --git a/package/libs/libjson-c/patches/000-libm.patch 
> b/package/libs/libjson-c/patches/000-libm.patch
> deleted file mode 100644
> index 45adb0597f..00
> --- a/package/libs/libjson-c/patches/000-libm.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
>  a/configure.ac
> -+++ b/configure.ac
> -@@ -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 ]])
> --AC_CHECK_DECLS([isnan], [], [], [[#include ]])
> --AC_CHECK_DECLS([isinf], [], [], [[#include ]])
> --AC_CHECK_DECLS([_isnan], [], [], [[#include ]])
> --AC_CHECK_DECLS([_finite], [], [], [[#include ]])
> -
> - #check if .section.gnu.warning accepts long strings (for __warn_references)
> - AC_LANG_PUSH([C])
>  a/math_compat.h
> -+++ b/math_compat.h
> -@@ -1,28 +1,9 @@
> - #ifndef __math_compat_h
> - #define __math_compat_h
> -
> --/* Define isnan and isinf on Windows/MSVC */
> --
> --#ifndef HAVE_DECL_ISNAN
> --# ifdef HAVE_DECL__ISNAN
> --#include 
> --#define isnan(x) _isnan(x)
> --# endif
> --#endif
> --
> --#ifndef HAVE_DECL_ISINF
> --# ifdef HAVE_DECL__FINITE
> --#include 
> --#define isinf(x) (!_finite(x))
> --# endif
> --#endif
> --
> --#ifndef HAVE_DECL_NAN
> --#error This platform does not have nan()
> --#endif
> --
> --#ifndef HAVE_DECL_INFINITY
> --#error This platform does not have INFINITY
> --#endif
> -+#undef isnan
> -+#define isnan(x) __builtin_isnan(x)
> -+#undef isinf
> -+#define isinf(x) __builtin_isinf(x)
> -
> - #endif
> --
> 2.16.3
>
>
> ___
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] libjson-c: Update to 0.13

2018-03-30 Thread Rosen Penev 
From: Daniel Engberg 

Update (lib)json-c to 0.13

Signed-off-by: Daniel Engberg 
Signed-off-by: Rosen Penev 
---
 package/libs/libjson-c/Makefile   |  4 +--
 package/libs/libjson-c/patches/000-libm.patch | 50 ---
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 package/libs/libjson-c/patches/000-libm.patch

diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index eeb7870f07..72b41e9fb8 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.12.1
+PKG_VERSION:=0.13
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
 PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
-PKG_HASH:=5a617da9aade997938197ef0f8aabd7f97b670c216dc173977e1d56eef9e1291
+PKG_HASH:=8572760646e9d23ee68f967ca62fa134a97b931665fd9af562192b7788c95a06
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
diff --git a/package/libs/libjson-c/patches/000-libm.patch 
b/package/libs/libjson-c/patches/000-libm.patch
deleted file mode 100644
index 45adb0597f..00
--- a/package/libs/libjson-c/patches/000-libm.patch
+++ /dev/null
@@ -1,50 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -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 ]])
--AC_CHECK_DECLS([isnan], [], [], [[#include ]])
--AC_CHECK_DECLS([isinf], [], [], [[#include ]])
--AC_CHECK_DECLS([_isnan], [], [], [[#include ]])
--AC_CHECK_DECLS([_finite], [], [], [[#include ]])
- 
- #check if .section.gnu.warning accepts long strings (for __warn_references)
- AC_LANG_PUSH([C])
 a/math_compat.h
-+++ b/math_compat.h
-@@ -1,28 +1,9 @@
- #ifndef __math_compat_h
- #define __math_compat_h
- 
--/* Define isnan and isinf on Windows/MSVC */
--
--#ifndef HAVE_DECL_ISNAN
--# ifdef HAVE_DECL__ISNAN
--#include 
--#define isnan(x) _isnan(x)
--# endif
--#endif
--
--#ifndef HAVE_DECL_ISINF
--# ifdef HAVE_DECL__FINITE
--#include 
--#define isinf(x) (!_finite(x))
--# endif
--#endif
--
--#ifndef HAVE_DECL_NAN
--#error This platform does not have nan()
--#endif
--
--#ifndef HAVE_DECL_INFINITY
--#error This platform does not have INFINITY
--#endif
-+#undef isnan
-+#define isnan(x) __builtin_isnan(x)
-+#undef isinf
-+#define isinf(x) __builtin_isinf(x)
- 
- #endif
-- 
2.16.3


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev