All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/xxhash: fix static library install
@ 2022-12-28 22:15 Fabrice Fontaine
  2022-12-28 22:15 ` [Buildroot] [PATCH 2/2] package/rsync: add xxhash support Fabrice Fontaine
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2022-12-28 22:15 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine

Install headers when building statically

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...dd-install_libxxhash.includes-target.patch | 39 +++++++++++++++++++
 package/xxhash/xxhash.mk                      | 15 +++++--
 2 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch

diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch
new file mode 100644
index 0000000000..22c8cdaadf
--- /dev/null
+++ b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch
@@ -0,0 +1,39 @@
+From b7c91f761b6d0b79398d0a064d2d6e34de3dfa47 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 27 Dec 2022 23:12:37 +0100
+Subject: [PATCH] Makefile: add install_libxxhash.includes target
+
+Add install_libxxhash.includes to be able to install headers when
+building and installing the static library
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/Cyan4973/xxHash/pull/776]
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index cfa5779..2276282 100644
+--- a/Makefile
++++ b/Makefile
+@@ -557,6 +557,8 @@ install_libxxhash: libxxhash
+ 	$(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR)
+ 	$(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR)
+ 	$(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT)
++
++install_libxxhash.includes:
+ 	$(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)   # includes
+ 	$(Q)$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR)
+ 	$(Q)$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0
+@@ -586,7 +588,7 @@ install_man:
+ 	$(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1
+ 
+ .PHONY: install
+-install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page
++install: install_libxxhash.a install_libxxhash install_libxxhash.includes install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page
+ 	@echo xxhash installation completed
+ 
+ .PHONY: uninstall
+-- 
+2.35.1
+
diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk
index a8f8d1d179..6932113f14 100644
--- a/package/xxhash/xxhash.mk
+++ b/package/xxhash/xxhash.mk
@@ -15,14 +15,23 @@ XXHASH_INSTALL_TARGETS = install_xxhsum
 
 ifeq ($(BR2_STATIC_LIBS),y)
 XXHASH_TARGETS += libxxhash.a libxxhash.pc
-XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc
+XXHASH_INSTALL_TARGETS += \
+	install_libxxhash.a \
+	install_libxxhash.includes \
+	install_libxxhash.pc
 else ifeq ($(BR2_SHARED_LIBS),y)
 XXHASH_TARGETS += libxxhash libxxhash.pc
-XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc
+XXHASH_INSTALL_TARGETS += \
+	install_libxxhash \
+	install_libxxhash.includes \
+	install_libxxhash.pc
 else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
 XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc
 XXHASH_INSTALL_TARGETS += \
-	install_libxxhash.a install_libxxhash install_libxxhash.pc
+	install_libxxhash.a \
+	install_libxxhash \
+	install_libxxhash.includes \
+	install_libxxhash.pc
 endif
 
 define XXHASH_BUILD_CMDS
-- 
2.35.1

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/rsync: add xxhash support
  2022-12-28 22:15 [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Fabrice Fontaine
@ 2022-12-28 22:15 ` Fabrice Fontaine
  2022-12-29  9:03   ` Thomas Petazzoni via buildroot
  2022-12-29  9:02 ` [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Thomas Petazzoni via buildroot
  2023-01-02 14:21 ` Peter Korsgaard
  2 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2022-12-28 22:15 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Fabrice Fontaine

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/rsync/rsync.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 8c7ad462ac..3cdd820fc0 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -19,7 +19,6 @@ RSYNC_CONF_OPTS = \
 	--with-included-popt=no \
 	--disable-roll-simd \
 	--disable-openssl \
-	--disable-xxhash \
 	--disable-zstd \
 	--disable-lz4 \
 	--disable-md5-asm
@@ -30,4 +29,11 @@ else
 RSYNC_CONF_OPTS += --disable-acl-support
 endif
 
+ifeq ($(BR2_PACKAGE_XXHASH),y)
+RSYNC_DEPENDENCIES += xxhash
+RSYNC_CONF_OPTS += --enable-xxhash
+else
+RSYNC_CONF_OPTS += --disable-xxhash
+endif
+
 $(eval $(autotools-package))
-- 
2.35.1

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/xxhash: fix static library install
  2022-12-28 22:15 [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Fabrice Fontaine
  2022-12-28 22:15 ` [Buildroot] [PATCH 2/2] package/rsync: add xxhash support Fabrice Fontaine
@ 2022-12-29  9:02 ` Thomas Petazzoni via buildroot
  2023-01-02 14:21 ` Peter Korsgaard
  2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-29  9:02 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

On Wed, 28 Dec 2022 23:15:21 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Install headers when building statically
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied thanks. One suggestion below.

>  ifeq ($(BR2_STATIC_LIBS),y)
>  XXHASH_TARGETS += libxxhash.a libxxhash.pc
> -XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc
> +XXHASH_INSTALL_TARGETS += \
> +	install_libxxhash.a \
> +	install_libxxhash.includes \
> +	install_libxxhash.pc
>  else ifeq ($(BR2_SHARED_LIBS),y)
>  XXHASH_TARGETS += libxxhash libxxhash.pc
> -XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc
> +XXHASH_INSTALL_TARGETS += \
> +	install_libxxhash \
> +	install_libxxhash.includes \
> +	install_libxxhash.pc
>  else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
>  XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc
>  XXHASH_INSTALL_TARGETS += \
> -	install_libxxhash.a install_libxxhash install_libxxhash.pc
> +	install_libxxhash.a \
> +	install_libxxhash \
> +	install_libxxhash.includes \
> +	install_libxxhash.pc
>  endif

This could be slightly "optimized", to reduce a bit the duplication:

XXHASH_INSTALL_TARGETS = \
	install_libxxhash.includes \
	install_libxxhash.pc

ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
XXHASH_INSTALL_TARGETS += install_libxxhash.a
endif

ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
XXHASH_INSTALL_TARGETS += install_libxxhash
endif

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/rsync: add xxhash support
  2022-12-28 22:15 ` [Buildroot] [PATCH 2/2] package/rsync: add xxhash support Fabrice Fontaine
@ 2022-12-29  9:03   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-29  9:03 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

On Wed, 28 Dec 2022 23:15:22 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/rsync/rsync.mk | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Applied to master, 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] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/xxhash: fix static library install
  2022-12-28 22:15 [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Fabrice Fontaine
  2022-12-28 22:15 ` [Buildroot] [PATCH 2/2] package/rsync: add xxhash support Fabrice Fontaine
  2022-12-29  9:02 ` [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Thomas Petazzoni via buildroot
@ 2023-01-02 14:21 ` Peter Korsgaard
  2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2023-01-02 14:21 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Bernd Kuhls, buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Install headers when building statically
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.11.x and 2022.02.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:[~2023-01-02 14:21 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-28 22:15 [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Fabrice Fontaine
2022-12-28 22:15 ` [Buildroot] [PATCH 2/2] package/rsync: add xxhash support Fabrice Fontaine
2022-12-29  9:03   ` Thomas Petazzoni via buildroot
2022-12-29  9:02 ` [Buildroot] [PATCH 1/2] package/xxhash: fix static library install Thomas Petazzoni via buildroot
2023-01-02 14:21 ` Peter Korsgaard

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.