testing/jdupes: use system xxhash

This commit is contained in:
psykose 2023-05-08 15:19:38 +00:00
parent d75911af8f
commit d2ec4dccde
2 changed files with 46 additions and 3 deletions

View File

@ -2,15 +2,17 @@
# Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
pkgname=jdupes
pkgver=1.22.0
pkgrel=3
pkgrel=4
pkgdesc="identifying and taking actions upon duplicate files"
options="!check" # No testsuite
url="https://github.com/jbruchon/jdupes"
arch="all"
license="MIT"
subpackages="$pkgname-doc"
makedepends="linux-headers libjodycode-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/jbruchon/jdupes/archive/v$pkgver.tar.gz"
makedepends="linux-headers libjodycode-dev xxhash-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/jbruchon/jdupes/archive/v$pkgver.tar.gz
system-xxhash.patch
"
build() {
make ENABLE_DEDUPE=1
@ -22,4 +24,5 @@ package() {
sha512sums="
b457be6566a0d3bb627fc8449a06ca8afabdd539d4b9150d1791aeba61cc1a25e8a3fb973fa4d91eb4c59af781616c7cc93c96753a8be7d3ca75e93aa47ed984 jdupes-1.22.0.tar.gz
ac182fd65d9058b742cffb2f3e0ec844c4376ab6b79cb20ef2b59321458304abb70757bb658e803bdf653d5b8abc910cc45b83e71c34752e586c0c1739758db6 system-xxhash.patch
"

View File

@ -0,0 +1,40 @@
diff --git a/Makefile b/Makefile
index efbd1ce..285e373 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,8 @@ COMPILER_OPTIONS += -DUSE_JODY_HASH
OBJS_CLEAN += xxhash.o
else
ifndef EXTERNAL_HASH_LIB
-OBJS += xxhash.o
+CFLAGS += `pkg-config --cflags libxxhash`
+LDFLAGS += `pkg-config --libs libxxhash`
endif
endif # USE_JODY_HASH
diff --git a/jdupes.c b/jdupes.c
index f47dfed..27bd3c5 100644
--- a/jdupes.c
+++ b/jdupes.c
@@ -42,7 +42,7 @@
#include <sys/time.h>
#include "jdupes.h"
#ifndef USE_JODY_HASH
- #include "xxhash.h"
+ #include <xxhash.h>
#endif
#ifdef ENABLE_DEDUPE
#include <sys/utsname.h>
diff --git a/jdupes.h b/jdupes.h
index 185e630..e375bb0 100644
--- a/jdupes.h
+++ b/jdupes.h
@@ -30,7 +30,7 @@ extern "C" {
#include <libjodycode.h>
#ifndef USE_JODY_HASH
-#include "xxhash.h"
+#include <xxhash.h>
#endif /* USE_JODY_HASH */
/* Set hash type (change this if swapping in a different hash function) */