summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--mingw-Makefile.patch52
3 files changed, 39 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18e644929c3f..1bd2ed9e6c1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-xxhash
pkgdesc = Extremely fast non-cryptographic hash algorithm (mingw-w64)
- pkgver = 0.8.1
+ pkgver = 0.8.2
pkgrel = 1
url = https://cyan4973.github.io/xxHash/
arch = any
@@ -13,9 +13,9 @@ pkgbase = mingw-w64-xxhash
options = !strip
options = !buildflags
options = staticlibs
- source = git+https://github.com/Cyan4973/xxHash.git#tag=35b0373c697b5f160d3db26b1cbb45a0d5ba788c
+ source = git+https://github.com/Cyan4973/xxHash.git#tag=bbb27a5efb85b92a0486cf361a8635715a53f6ba
source = mingw-Makefile.patch
b2sums = SKIP
- b2sums = dae60c9356e0f27575ef29da73c3c000ce48baeb4ec3dfab57264fe39559374128316729b4db933a97c0fe35da8024c5879c70ba6ecab0a36114d1c80552c98d
+ b2sums = 4021554a1261cb517a249173a5552a96a73f9261ecf5d7f59e1e449cff7e7ced81d6791d501bbb2d86f2406a993275500890ee00a6cf02e0e95f13b5fb283287
pkgname = mingw-w64-xxhash
diff --git a/PKGBUILD b/PKGBUILD
index 0732719c16a2..e1a0cd11ca86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Konstantin Gizdov <arch@kge.com>
pkgname=mingw-w64-xxhash
-pkgver=0.8.1
+pkgver=0.8.2
pkgrel=1
pkgdesc='Extremely fast non-cryptographic hash algorithm (mingw-w64)'
arch=('any')
@@ -16,11 +16,11 @@ license=(
depends=('mingw-w64-crt')
options=(!strip !buildflags staticlibs)
makedepends=('mingw-w64-gcc' 'mingw-w64-make' 'git')
-_tag=35b0373c697b5f160d3db26b1cbb45a0d5ba788c
+_tag=bbb27a5efb85b92a0486cf361a8635715a53f6ba
source=(git+https://github.com/Cyan4973/xxHash.git#tag=${_tag}
mingw-Makefile.patch)
b2sums=('SKIP'
- 'dae60c9356e0f27575ef29da73c3c000ce48baeb4ec3dfab57264fe39559374128316729b4db933a97c0fe35da8024c5879c70ba6ecab0a36114d1c80552c98d')
+ '4021554a1261cb517a249173a5552a96a73f9261ecf5d7f59e1e449cff7e7ced81d6791d501bbb2d86f2406a993275500890ee00a6cf02e0e95f13b5fb283287')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
pkgver() {
@@ -37,15 +37,14 @@ prepare() {
build() {
for _arch in ${_architectures}; do
cp -r "${srcdir}"/xxHash "${srcdir}"/build-${_arch} && cd "${srcdir}"/build-${_arch}
- ${_arch}-make PREFIX=/usr/${_arch}
+ ${_arch}-make PREFIX=/usr/${_arch} DISPATCH=1
done
}
package() {
for _arch in ${_architectures}; do
cd "${srcdir}"/build-${_arch}
- ${_arch}-make PREFIX=/usr/${_arch} DESTDIR="${pkgdir}" install
- mv "${pkgdir}"/usr/${_arch}/bin/libxxhash.dll.a "${pkgdir}"/usr/${_arch}/lib/libxxhash.dll.a
+ ${_arch}-make PREFIX=/usr/${_arch} DISPATCH=1 DESTDIR="${pkgdir}" install
install -Dm 644 LICENSE -t "${pkgdir}"/usr/${_arch}/share/licenses/xxhash
done
}
diff --git a/mingw-Makefile.patch b/mingw-Makefile.patch
index b959a71b7e51..7968dde31a58 100644
--- a/mingw-Makefile.patch
+++ b/mingw-Makefile.patch
@@ -1,5 +1,5 @@
---- xxHash.orig/Makefile 2021-03-11 21:46:58.129999604 +0100
-+++ xxHash/Makefile 2021-03-11 21:47:17.273332927 +0100
+--- xxHash.orig/Makefile 2023-07-27 13:34:32.183333333 +0200
++++ xxHash/Makefile 2023-07-27 13:42:43.283333333 +0200
@@ -49,11 +49,7 @@
UNAME := $(shell uname)
@@ -10,9 +10,9 @@
-EXT =
-endif
- # OS X linker doesn't support -soname, and use different extension
- # see: https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
-@@ -63,8 +59,8 @@
+ ifeq ($(NODE_JS),1)
+ # Link in unrestricted filesystem support
+@@ -70,8 +66,8 @@
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
else
@@ -23,7 +23,7 @@
SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
endif
-@@ -119,9 +115,7 @@
+@@ -140,9 +136,7 @@
$(AR) $(ARFLAGS) $@ $^
$(LIBXXH): LDFLAGS += -shared
@@ -33,27 +33,26 @@
ifeq ($(DISPATCH),1)
$(LIBXXH): xxh_x86dispatch.c
endif
-@@ -444,11 +438,13 @@
- .PHONY: install
- install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page
+@@ -579,10 +573,12 @@
+
+ install_libxxhash: libxxhash
@echo Installing libxxhash
-+ $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
- $(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR)
++ $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- $(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)
-+ $(Q)$(INSTALL_PROGRAM) libxxhash.dll.a $(DESTDIR)$(BINDIR)
++ $(Q)$(INSTALL_PROGRAM) libxxhash.dll.a $(DESTDIR)$(LIBDIR)
+ $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(BINDIR)
+ $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(BINDIR)/libxxhash.$(SHARED_EXT_MAJOR)
+ $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(BINDIR)/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
-@@ -460,10 +456,10 @@
- $(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/
+@@ -600,10 +596,10 @@
+ install_xxhsum: xxhsum
@echo Installing xxhsum
- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
- $(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum
- $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum
- $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum
@@ -62,10 +61,21 @@
+ $(Q)ln -sf xxhsum$(EXT) $(DESTDIR)$(BINDIR)/xxh32sum$(EXT)
+ $(Q)ln -sf xxhsum$(EXT) $(DESTDIR)$(BINDIR)/xxh64sum$(EXT)
+ $(Q)ln -sf xxhsum$(EXT) $(DESTDIR)$(BINDIR)/xxh128sum$(EXT)
+
+ install_man:
@echo Installing man pages
- $(Q)$(INSTALL_DATA) xxhsum.1 $(DESTDIR)$(MANDIR)/xxhsum.1
- $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1
-@@ -481,10 +477,10 @@
+@@ -620,17 +616,18 @@
+ .PHONY: uninstall
+ uninstall: ## uninstall libraries, CLI, links and man page
+ $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libxxhash.a
+- $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT)
+- $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR)
+- $(Q)$(RM) $(DESTDIR)$(LIBDIR)/$(LIBXXH)
++ $(Q)$(RM) $(DESTDIR)$(LIBDIR)/libxxhash.dll.a
++ $(Q)$(RM) $(DESTDIR)$(BINDIR)/libxxhash.$(SHARED_EXT)
++ $(Q)$(RM) $(DESTDIR)$(BINDIR)/libxxhash.$(SHARED_EXT_MAJOR)
++ $(Q)$(RM) $(DESTDIR)$(BINDIR)/$(LIBXXH)
+ $(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/xxhash.h
$(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/xxh3.h
$(Q)$(RM) $(DESTDIR)$(INCLUDEDIR)/xxh_x86dispatch.h
$(Q)$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libxxhash.pc