Skip to contentSkip to conversation

package/libgit2: Bump to version 1.0.0

PATCH New Nicolas Cavallari 2 participants 2 messages Apr 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/libgit2: Bump to version 1.0.0

This version changes the required dependencies as well as introducing new bundled ones...

- Start depending on httpparser, instead of using the bundled one.
- Force using regcomp instead of using a bundled pcre.
- Add license for a bundled wildmatch and sha1.

---
v2: changed "BSD 4-clause variant" to "wildmatch license"
changed SITE to use LIBGIT2_VERSION
added kconfig comment for static libs toolchains

---
 package/libgit2/Config.in    |  5 +++++
 package/libgit2/libgit2.hash |  4 ++--
 package/libgit2/libgit2.mk   | 10 ++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)
package/libgit2/Config.in +5 -0
index 53ba4d4245..a6a9728ff0 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBGIT2
 	bool "libgit2"
+	depends on !BR2_STATIC_LIBS # libhttpparser
+	select BR2_PACKAGE_LIBHTTPPARSER
 	select BR2_PACKAGE_ZLIB
 	help
 	  libgit2 is a portable, pure C implementation of the Git core
@@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBGIT2
 	  allowing to build Git functionality into your application.
 
 	  https://github.com/libgit2/libgit2
+
+comment "libgit2 needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
package/libgit2/libgit2.hash +2 -2
index d4912c0327..a7d910e3bf 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749  libgit2-0.28.4.tar.gz
-sha256	d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813  COPYING
+sha256	6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4  libgit2-1.0.0.tar.gz
+sha256	afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42  COPYING
package/libgit2/libgit2.mk +6 -4
index 909fcb83f0..39df9f2be7 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBGIT2_VERSION = 0.28.4
-LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
-LIBGIT2_LICENSE = GPL-2.0 with linking exception
+LIBGIT2_VERSION = 1.0.0
+LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION)
+LIBGIT2_LICENSE = GPL-2.0 with linking exception, wildmatch license (wildmatch), MIT (sha1)
 LIBGIT2_LICENSE_FILES = COPYING
 LIBGIT2_INSTALL_STAGING = YES
 
@@ -14,9 +14,11 @@ LIBGIT2_CONF_OPTS = \
 	-DUSE_GSSAPI=OFF \
 	-DBUILD_CLAR=OFF \
 	-DUSE_ICONV=ON \
+	-DREGEX_BACKEND=regcomp \
+	-DUSE_HTTP_PARSER=system \
 	-DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF)
 
-LIBGIT2_DEPENDENCIES = zlib
+LIBGIT2_DEPENDENCIES = zlib libhttpparser
 
 # If libiconv is available (for !locale toolchains), then we can use
 # it for iconv support. Note that USE_ICONV=ON is still correct even
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 package/libgit2: Bump to version 1.0.0

Nisolas, All,

On 2020-04-17 09:28 +0200, Nicolas Cavallari spake thusly:

Quoted 8 lines

This version changes the required dependencies as well as introducing new bundled ones...

- Start depending on httpparser, instead of using the bundled one.
- Force using regcomp instead of using a bundled pcre.
- Add license for a bundled wildmatch and sha1.

I have:
- added a blurb about why we drop the github helper,
- reordered the license lists to have the known ones first,
- changed to using two spaces in hash file
- pushed that to master

Thanks!

Regards,
Yann E. MORIN.

Quoted 76 lines

---
v2: changed "BSD 4-clause variant" to "wildmatch license"
changed SITE to use LIBGIT2_VERSION
added kconfig comment for static libs toolchains

---
 package/libgit2/Config.in    |  5 +++++
 package/libgit2/libgit2.hash |  4 ++--
 package/libgit2/libgit2.mk   | 10 ++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)
package/libgit2/Config.in +5 -0
index 53ba4d4245..a6a9728ff0 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBGIT2
 	bool "libgit2"
+	depends on !BR2_STATIC_LIBS # libhttpparser
+	select BR2_PACKAGE_LIBHTTPPARSER
 	select BR2_PACKAGE_ZLIB
 	help
 	  libgit2 is a portable, pure C implementation of the Git core
@@ -7,3 +9,6 @@ config BR2_PACKAGE_LIBGIT2
 	  allowing to build Git functionality into your application.
 
 	  https://github.com/libgit2/libgit2
+
+comment "libgit2 needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
package/libgit2/libgit2.hash +2 -2
index d4912c0327..a7d910e3bf 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749  libgit2-0.28.4.tar.gz
-sha256	d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813  COPYING
+sha256	6a1fa16a7f6335ce8b2630fbdbb5e57c4027929ebc56fcd1ac55edb141b409b4  libgit2-1.0.0.tar.gz
+sha256	afc8bde99ba630012107c25d3c42dde628ec5f0cd3f428131f7e3a0f7d58ff42  COPYING
package/libgit2/libgit2.mk +6 -4
index 909fcb83f0..39df9f2be7 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBGIT2_VERSION = 0.28.4
-LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
-LIBGIT2_LICENSE = GPL-2.0 with linking exception
+LIBGIT2_VERSION = 1.0.0
+LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION)
+LIBGIT2_LICENSE = GPL-2.0 with linking exception, wildmatch license (wildmatch), MIT (sha1)
 LIBGIT2_LICENSE_FILES = COPYING
 LIBGIT2_INSTALL_STAGING = YES
 
@@ -14,9 +14,11 @@ LIBGIT2_CONF_OPTS = \
 	-DUSE_GSSAPI=OFF \
 	-DBUILD_CLAR=OFF \
 	-DUSE_ICONV=ON \
+	-DREGEX_BACKEND=regcomp \
+	-DUSE_HTTP_PARSER=system \
 	-DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF)
 
-LIBGIT2_DEPENDENCIES = zlib
+LIBGIT2_DEPENDENCIES = zlib libhttpparser
 
 # If libiconv is available (for !locale toolchains), then we can use
 # it for iconv support. Note that USE_ICONV=ON is still correct even
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'