deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/xxhash: fix static library install 

Install headers when building statically

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2023.02.x
Fabrice Fontaine 2022-12-28 23:15:21 +01:00 committed by Thomas Petazzoni
parent 14bb74b461
commit 0945e4913f
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch 100644
View File

@ -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

15
package/xxhash/xxhash.mk
View File

@ -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