* [ptxdist] [PATCH 0/2] json-c: version bump 0.13.1 -> 0.14
@ 2020-05-04 11:44 Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 1/2] json-c: Revert URL to upstream provided tarballs Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
0 siblings, 2 replies; 5+ messages in thread
From: Alexander Dahl @ 2020-05-04 11:44 UTC (permalink / raw)
To: ptxdist
Hei hei,
I made two commits for this version bump, one for switching the download
URL back to the one where upstream provides tarballs and checksums
(instead of GitHub creating them). The other one is the version bump
itself. Build tested only.
Greets
Alex
Alexander Dahl (2):
json-c: Revert URL to upstream provided tarballs
json-c: version bump 0.13.1 -> 0.14
rules/json-c.make | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 1/2] json-c: Revert URL to upstream provided tarballs
2020-05-04 11:44 [ptxdist] [PATCH 0/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
@ 2020-05-04 11:44 ` Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
1 sibling, 0 replies; 5+ messages in thread
From: Alexander Dahl @ 2020-05-04 11:44 UTC (permalink / raw)
To: ptxdist
With 815c24d3b783 ("json-c: version bump 0.12 -> 0.12.1") URL was
changed, because back then it seemed upstream moved the project to
GitHub and would not provide tarballs anymore. They did again later,
however.
There are checksums of old releases at
https://github.com/json-c/json-c/wiki and all release tarballs are
available from the old/new URL. This avoids the archives built by GitHub
from source.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/json-c.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/json-c.make b/rules/json-c.make
index d4b4fc468..f6df25dba 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
#
# Paths and names
#
-JSON_C_VERSION := 0.13.1-20180305
-JSON_C_MD5 := 20dba7bf773599a0842745a2fe5b7cd3
+JSON_C_VERSION := 0.13.1
+JSON_C_MD5 := 04969ad59cc37bddd83741a08b98f350
JSON_C := json-c-$(JSON_C_VERSION)
JSON_C_SUFFIX := tar.gz
-JSON_C_URL := https://github.com/json-c/json-c/archive/$(JSON_C).$(JSON_C_SUFFIX)
+JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX)
JSON_C_SOURCE := $(SRCDIR)/$(JSON_C).$(JSON_C_SUFFIX)
JSON_C_DIR := $(BUILDDIR)/$(JSON_C)
JSON_C_LICENSE := MIT
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14
2020-05-04 11:44 [ptxdist] [PATCH 0/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 1/2] json-c: Revert URL to upstream provided tarballs Alexander Dahl
@ 2020-05-04 11:44 ` Alexander Dahl
2020-05-05 7:06 ` Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Dahl @ 2020-05-04 11:44 UTC (permalink / raw)
To: ptxdist
Quoting from the file 'ChangeLog':
> Build machinery has been switched to CMake.
The announcement is not clear about that however:
https://groups.google.com/forum/#!topic/json-c/yLwwAqiRf-4
Options are pinned like they were for the old autotools build (shared
lib, no threads, no rdrand) and what seemed to make sense in this build
environment.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/json-c.make | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/rules/json-c.make b/rules/json-c.make
index f6df25dba..f2a990bf4 100644
--- a/rules/json-c.make
+++ b/rules/json-c.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
#
# Paths and names
#
-JSON_C_VERSION := 0.13.1
-JSON_C_MD5 := 04969ad59cc37bddd83741a08b98f350
+JSON_C_VERSION := 0.14
+JSON_C_MD5 := 72cbb065b43376d825cd521d115ae1f6
JSON_C := json-c-$(JSON_C_VERSION)
JSON_C_SUFFIX := tar.gz
JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX)
@@ -28,15 +28,16 @@ JSON_C_LICENSE_FILES := file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
# Prepare
# ----------------------------------------------------------------------------
-#
-# autoconf
-#
-JSON_C_CONF_TOOL := autoconf
+JSON_C_CONF_TOOL := cmake
JSON_C_CONF_OPT := \
- $(CROSS_AUTOCONF_USR) \
- --disable-threading \
- --disable-rdrand \
- --disable-static
+ $(CROSS_CMAKE_USR) \
+ -DBUILD_DOCUMENTATION:BOOL=OFF \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_TESTING:BOOL=OFF \
+ -DDISABLE_BSYMBOLIC:BOOL=ON \
+ -DDISABLE_WERROR:BOOL=ON \
+ -DENABLE_RDRAND:BOOL=OFF \
+ -DENABLE_THREADING:BOOL=OFF
# ----------------------------------------------------------------------------
# Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14
2020-05-04 11:44 ` [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
@ 2020-05-05 7:06 ` Michael Olbrich
2020-05-05 7:10 ` Alexander Dahl
0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2020-05-05 7:06 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
On Mon, May 04, 2020 at 01:44:16PM +0200, Alexander Dahl wrote:
> Quoting from the file 'ChangeLog':
>
> > Build machinery has been switched to CMake.
Your need to select HOST_CMAKE for this.
And the host-json-c needs updating as well.
Michael
> The announcement is not clear about that however:
>
> https://groups.google.com/forum/#!topic/json-c/yLwwAqiRf-4
>
> Options are pinned like they were for the old autotools build (shared
> lib, no threads, no rdrand) and what seemed to make sense in this build
> environment.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
> rules/json-c.make | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/rules/json-c.make b/rules/json-c.make
> index f6df25dba..f2a990bf4 100644
> --- a/rules/json-c.make
> +++ b/rules/json-c.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_JSON_C) += json-c
> #
> # Paths and names
> #
> -JSON_C_VERSION := 0.13.1
> -JSON_C_MD5 := 04969ad59cc37bddd83741a08b98f350
> +JSON_C_VERSION := 0.14
> +JSON_C_MD5 := 72cbb065b43376d825cd521d115ae1f6
> JSON_C := json-c-$(JSON_C_VERSION)
> JSON_C_SUFFIX := tar.gz
> JSON_C_URL := https://s3.amazonaws.com/json-c_releases/releases/$(JSON_C).$(JSON_C_SUFFIX)
> @@ -28,15 +28,16 @@ JSON_C_LICENSE_FILES := file://COPYING;md5=de54b60fbbc35123ba193fea8ee216f2
> # Prepare
> # ----------------------------------------------------------------------------
>
> -#
> -# autoconf
> -#
> -JSON_C_CONF_TOOL := autoconf
> +JSON_C_CONF_TOOL := cmake
> JSON_C_CONF_OPT := \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-threading \
> - --disable-rdrand \
> - --disable-static
> + $(CROSS_CMAKE_USR) \
> + -DBUILD_DOCUMENTATION:BOOL=OFF \
> + -DBUILD_SHARED_LIBS:BOOL=ON \
> + -DBUILD_TESTING:BOOL=OFF \
> + -DDISABLE_BSYMBOLIC:BOOL=ON \
> + -DDISABLE_WERROR:BOOL=ON \
> + -DENABLE_RDRAND:BOOL=OFF \
> + -DENABLE_THREADING:BOOL=OFF
>
> # ----------------------------------------------------------------------------
> # Install
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14
2020-05-05 7:06 ` Michael Olbrich
@ 2020-05-05 7:10 ` Alexander Dahl
0 siblings, 0 replies; 5+ messages in thread
From: Alexander Dahl @ 2020-05-05 7:10 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
Hei hei,
Am Dienstag, 5. Mai 2020, 09:06:45 CEST schrieb Michael Olbrich:
> On Mon, May 04, 2020 at 01:44:16PM +0200, Alexander Dahl wrote:
> > Quoting from the file 'ChangeLog':
> > > Build machinery has been switched to CMake.
>
> Your need to select HOST_CMAKE for this.
Of course. Sorry, this probably worked for me by accident, because I have a
lot of other packages depending on host cmake.
> And the host-json-c needs updating as well.
Well, I wasn't aware of that one.
Will send v2.
Alex
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-05 7:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 11:44 [ptxdist] [PATCH 0/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 1/2] json-c: Revert URL to upstream provided tarballs Alexander Dahl
2020-05-04 11:44 ` [ptxdist] [PATCH 2/2] json-c: version bump 0.13.1 -> 0.14 Alexander Dahl
2020-05-05 7:06 ` Michael Olbrich
2020-05-05 7:10 ` Alexander Dahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox