All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0
@ 2021-09-08 13:30 Nicolas Cavallari
  2021-09-08 13:30 ` [Buildroot] [PATCH 1/1] package/libressl: depend on threads Nicolas Cavallari
  2021-09-20 19:04 ` [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Arnout Vandecappelle
  0 siblings, 2 replies; 5+ messages in thread
From: Nicolas Cavallari @ 2021-09-08 13:30 UTC (permalink / raw)
  To: buildroot

COPYING was updated with a copy of the openssl licence since libgit2 now
include openssl headers so it can dlopen it:

    openssl: dynamically load libssl and symbols (optionally)

    Provide an interface around OpenSSL to dynamically load the
    libraries and symbols, so that users can distribute a libgit2
    library that is not linked directly against OpenSSL.  This enables
    users to target multiple distributions with a single binary.

    This mechanism is optional and disabled by default.  Configure cmake
    with -DUSE_HTTPS=OpenSSL-Dynamic to use it.

We do not use that option so the headers are not even used, plus the
headers are not installed on the target anyway, so this patch includes
no license changes.

Upstream also stopped providing release tarballs, relying on
github-generated tarballs instead.

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
---
 package/libgit2/libgit2.hash | 4 ++--
 package/libgit2/libgit2.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash
index 367ade3afe..5522f5fe45 100644
--- a/package/libgit2/libgit2.hash
+++ b/package/libgit2/libgit2.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba  libgit2-1.1.0.tar.gz
-sha256  afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42  COPYING
+sha256  701a5086a968a46f25e631941b99fc23e4755ca2c56f59371ce1d94b9a0cc643  libgit2-1.2.0.tar.gz
+sha256  8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af  COPYING
diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk
index 668fa758f8..4c715302d1 100644
--- a/package/libgit2/libgit2.mk
+++ b/package/libgit2/libgit2.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBGIT2_VERSION = 1.1.0
-LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION)
+LIBGIT2_VERSION = 1.2.0
+LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
 LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch)
 LIBGIT2_LICENSE_FILES = COPYING
 LIBGIT2_CPE_ID_VENDOR = libgit2_project
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH 1/1] package/libressl: depend on threads
  2021-09-08 13:30 [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Nicolas Cavallari
@ 2021-09-08 13:30 ` Nicolas Cavallari
  2021-09-20 19:08   ` Arnout Vandecappelle
  2021-10-04 13:09   ` Peter Korsgaard
  2021-09-20 19:04 ` [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Arnout Vandecappelle
  1 sibling, 2 replies; 5+ messages in thread
From: Nicolas Cavallari @ 2021-09-08 13:30 UTC (permalink / raw)
  To: buildroot

If the toolchain does not have threads (e.g. br-arm-full-nothread),
compilation fails:

In file included from /home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/cryptlib.c:117:
/home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/../include/compat/pthread.h:114:15: fatal error: pthread.h: No such file or directory
  114 | #include_next <pthread.h>
      |               ^~~~~~~~~~~
compilation terminated.

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
---
 package/openssl/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index f69e85978f..bdcf7e2773 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -33,6 +33,7 @@ source "package/libopenssl/Config.in"
 config BR2_PACKAGE_LIBRESSL
 	bool "libressl"
 	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# uClibc on noMMU doesn't provide __register_atfork()
 	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU)
 	help
-- 
2.33.0

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0
  2021-09-08 13:30 [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Nicolas Cavallari
  2021-09-08 13:30 ` [Buildroot] [PATCH 1/1] package/libressl: depend on threads Nicolas Cavallari
@ 2021-09-20 19:04 ` Arnout Vandecappelle
  1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2021-09-20 19:04 UTC (permalink / raw)
  To: Nicolas Cavallari, buildroot



On 08/09/2021 15:30, Nicolas Cavallari wrote:
> COPYING was updated with a copy of the openssl licence since libgit2 now
> include openssl headers so it can dlopen it:
> 
>      openssl: dynamically load libssl and symbols (optionally)
> 
>      Provide an interface around OpenSSL to dynamically load the
>      libraries and symbols, so that users can distribute a libgit2
>      library that is not linked directly against OpenSSL.  This enables
>      users to target multiple distributions with a single binary.
> 
>      This mechanism is optional and disabled by default.  Configure cmake
>      with -DUSE_HTTPS=OpenSSL-Dynamic to use it.
> 
> We do not use that option so the headers are not even used, plus the
> headers are not installed on the target anyway, so this patch includes
> no license changes.

  Thank you for the *excellent* explanation!

  Applied to master, thanks.

  Regards,
  Arnout

> 
> Upstream also stopped providing release tarballs, relying on
> github-generated tarballs instead.
> 
> Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
> ---
>   package/libgit2/libgit2.hash | 4 ++--
>   package/libgit2/libgit2.mk   | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash
> index 367ade3afe..5522f5fe45 100644
> --- a/package/libgit2/libgit2.hash
> +++ b/package/libgit2/libgit2.hash
> @@ -1,3 +1,3 @@
>   # Locally calculated
> -sha256  ad73f845965cfd528e70f654e428073121a3fa0dc23caac81a1b1300277d4dba  libgit2-1.1.0.tar.gz
> -sha256  afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42  COPYING
> +sha256  701a5086a968a46f25e631941b99fc23e4755ca2c56f59371ce1d94b9a0cc643  libgit2-1.2.0.tar.gz
> +sha256  8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af  COPYING
> diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk
> index 668fa758f8..4c715302d1 100644
> --- a/package/libgit2/libgit2.mk
> +++ b/package/libgit2/libgit2.mk
> @@ -4,8 +4,8 @@
>   #
>   ################################################################################
>   
> -LIBGIT2_VERSION = 1.1.0
> -LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION)
> +LIBGIT2_VERSION = 1.2.0
> +LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
>   LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch)
>   LIBGIT2_LICENSE_FILES = COPYING
>   LIBGIT2_CPE_ID_VENDOR = libgit2_project
> 
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/libressl: depend on threads
  2021-09-08 13:30 ` [Buildroot] [PATCH 1/1] package/libressl: depend on threads Nicolas Cavallari
@ 2021-09-20 19:08   ` Arnout Vandecappelle
  2021-10-04 13:09   ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2021-09-20 19:08 UTC (permalink / raw)
  To: Nicolas Cavallari, buildroot



On 08/09/2021 15:30, Nicolas Cavallari wrote:
> If the toolchain does not have threads (e.g. br-arm-full-nothread),
> compilation fails:
> 
> In file included from /home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/cryptlib.c:117:
> /home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/../include/compat/pthread.h:114:15: fatal error: pthread.h: No such file or directory
>    114 | #include_next <pthread.h>
>        |               ^~~~~~~~~~~
> compilation terminated.
> 
> Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/openssl/Config.in | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/package/openssl/Config.in b/package/openssl/Config.in
> index f69e85978f..bdcf7e2773 100644
> --- a/package/openssl/Config.in
> +++ b/package/openssl/Config.in
> @@ -33,6 +33,7 @@ source "package/libopenssl/Config.in"
>   config BR2_PACKAGE_LIBRESSL
>   	bool "libressl"
>   	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
>   	# uClibc on noMMU doesn't provide __register_atfork()
>   	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU)
>   	help
> 
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/libressl: depend on threads
  2021-09-08 13:30 ` [Buildroot] [PATCH 1/1] package/libressl: depend on threads Nicolas Cavallari
  2021-09-20 19:08   ` Arnout Vandecappelle
@ 2021-10-04 13:09   ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2021-10-04 13:09 UTC (permalink / raw)
  To: Nicolas Cavallari; +Cc: buildroot

>>>>> "Nicolas" == Nicolas Cavallari <nicolas.cavallari@green-communications.fr> writes:

 > If the toolchain does not have threads (e.g. br-arm-full-nothread),
 > compilation fails:

 > In file included from /home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/cryptlib.c:117:
 > /home/fail/br-test-pkg/br-arm-full-nothread/build/libressl-3.3.3/crypto/../include/compat/pthread.h:114:15: fatal error: pthread.h: No such file or directory
 >   114 | #include_next <pthread.h>
 >       |               ^~~~~~~~~~~
 > compilation terminated.

 > Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>

Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-10-04 13:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 13:30 [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Nicolas Cavallari
2021-09-08 13:30 ` [Buildroot] [PATCH 1/1] package/libressl: depend on threads Nicolas Cavallari
2021-09-20 19:08   ` Arnout Vandecappelle
2021-10-04 13:09   ` Peter Korsgaard
2021-09-20 19:04 ` [Buildroot] [PATCH 1/1] package/libgit2: bump to version 1.2.0 Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.