* [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed @ 2022-08-12 14:56 Nicolas Cavallari 2022-08-12 14:56 ` [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 Nicolas Cavallari 2022-08-14 10:06 ` [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Thomas Petazzoni via buildroot 0 siblings, 2 replies; 4+ messages in thread From: Nicolas Cavallari @ 2022-08-12 14:56 UTC (permalink / raw) To: buildroot libgit2 is currently a library without any reverse dependencies so the missing atomic symbols do not cause build failures yet. libgit2 uses the atomics intrinsics on gcc >= 4.7 and the sync intrinsics on previous gcc versions. Since gcc 4.9 is the new minimum, ignore the sync intrinsics requirements. The next version of libgit2 will also build a binary, which will expose the problem. Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> --- v3: first series with this patch --- package/libgit2/libgit2.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 3f1e6e1593..9b5e2b897d 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -44,4 +44,9 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGIT2_CONF_OPTS += \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) -- 2.36.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 2022-08-12 14:56 [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Nicolas Cavallari @ 2022-08-12 14:56 ` Nicolas Cavallari 2022-08-14 10:07 ` Thomas Petazzoni via buildroot 2022-08-14 10:06 ` [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Thomas Petazzoni via buildroot 1 sibling, 1 reply; 4+ messages in thread From: Nicolas Cavallari @ 2022-08-12 14:56 UTC (permalink / raw) To: buildroot It includes an option to build a command line program that can be used to replace git in simple cases. The upcoming sha256 repository support made them steal the sha256 code from RFC6234, hence the license change. Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> --- v2 -> v3: link executable with -latomic Tested with test-pkg on top of af972178b v1 -> v2: fix scissor lines v1: Tested with test-pkg with various options on top of 417eb476fd. It works, except for bootlin-armv7m-uclibc which always fails with "MMU support available in C library, please enable BR2_USE_MMU" when configuring the toolchain. --- package/libgit2/Config.in | 10 ++++++++++ package/libgit2/libgit2.hash | 4 ++-- package/libgit2/libgit2.mk | 16 ++++++++++++++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index a6a9728ff0..5d28f054f2 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -12,3 +12,13 @@ config BR2_PACKAGE_LIBGIT2 comment "libgit2 needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +if BR2_PACKAGE_LIBGIT2 + +config BR2_PACKAGE_LIBGIT2_CLI + bool "enable command line interface (git2_cli)" + help + Enable a command-line interface for libgit2. + It aims to be git-compatible. + +endif diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 3b5837f789..fb760fd4cc 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f48b961e463a9e4e7e7e58b21a0fb5a9b2a1d24d9ba4d15870a0c9b8ad965163 libgit2-1.4.3.tar.gz -sha256 0092f24acc306ee3287dc05b5e85cb9e0e48cd3f11c60c4625b1a673a5912616 COPYING +sha256 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e libgit2-1.5.0.tar.gz +sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 9b5e2b897d..9409011eb4 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,9 +4,14 @@ # ################################################################################ -LIBGIT2_VERSION = 1.4.3 +LIBGIT2_VERSION = 1.5.0 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch), CC0-1.0 (xoroshiro256) +LIBGIT2_LICENSE = \ + GPL-2.0 with linking exception, \ + MIT (sha1), \ + BSD-3-Clause (sha256), \ + wildmatch license (wildmatch), \ + CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -44,8 +49,15 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_PACKAGE_LIBGIT2_CLI),y) +LIBGIT2_CONF_OPTS += -DBUILD_CLI=ON +else +LIBGIT2_CONF_OPTS += -DBUILD_CLI=OFF +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBGIT2_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ -DCMAKE_SHARED_LINKER_FLAGS=-latomic endif -- 2.36.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 2022-08-12 14:56 ` [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 Nicolas Cavallari @ 2022-08-14 10:07 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2022-08-14 10:07 UTC (permalink / raw) To: Nicolas Cavallari; +Cc: buildroot On Fri, 12 Aug 2022 16:56:52 +0200 Nicolas Cavallari <nicolas.cavallari@green-communications.fr> wrote: > It includes an option to build a command line program that can be used > to replace git in simple cases. > > The upcoming sha256 repository support made them steal the sha256 code > from RFC6234, hence the license change. > > Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> > > --- > v2 -> v3: link executable with -latomic > Tested with test-pkg on top of af972178b Applied to next, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed 2022-08-12 14:56 [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Nicolas Cavallari 2022-08-12 14:56 ` [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 Nicolas Cavallari @ 2022-08-14 10:06 ` Thomas Petazzoni via buildroot 1 sibling, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2022-08-14 10:06 UTC (permalink / raw) To: Nicolas Cavallari; +Cc: buildroot On Fri, 12 Aug 2022 16:56:51 +0200 Nicolas Cavallari <nicolas.cavallari@green-communications.fr> wrote: > libgit2 is currently a library without any reverse dependencies so the > missing atomic symbols do not cause build failures yet. > > libgit2 uses the atomics intrinsics on gcc >= 4.7 and the sync > intrinsics on previous gcc versions. Since gcc 4.9 is the new > minimum, ignore the sync intrinsics requirements. > > The next version of libgit2 will also build a binary, which will > expose the problem. > > Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> > > --- > v3: first series with this patch > --- > package/libgit2/libgit2.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. I will also cherry-pick in next. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-14 10:07 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-08-12 14:56 [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Nicolas Cavallari 2022-08-12 14:56 ` [Buildroot] [PATCH v3 2/2] package/libgit2: bump to 1.5.0 Nicolas Cavallari 2022-08-14 10:07 ` Thomas Petazzoni via buildroot 2022-08-14 10:06 ` [Buildroot] [PATCH v3 1/2] package/libgit2: link with -latomic if needed Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox