lz4cli: consolidate xxhash to third_party version

remove the internal xxhash within lz4cli and consolidate to the one true xxhash within third_party.
jart · Jul 8, 2023 · c0bd692 · c0bd692
1 parent 3a85792
commit c0bd692
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1,192 deletions.
diff --git a/third_party/lz4cli/bench.c b/third_party/lz4cli/bench.c
@@ -46,7 +46,7 @@
 #include "libc/runtime/runtime.h"      /* assert */
 
 #include "third_party/lz4cli/datagen.h"     /* RDG_genBuffer */
-#include "third_party/lz4cli/xxhash.h"
+#include "third_party/xxhash/xxhash.h"
 
 
 #include "third_party/lz4cli/lz4.h"

diff --git a/third_party/lz4cli/lz4cli.mk b/third_party/lz4cli/lz4cli.mk
@@ -27,8 +27,7 @@ THIRD_PARTY_LZ4CLI_OBJS =				\
 	o/$(MODE)/third_party/lz4cli/lz4io.o		\
 	o/$(MODE)/third_party/lz4cli/lz4hc.o		\
 	o/$(MODE)/third_party/lz4cli/lz4frame.o		\
-	o/$(MODE)/third_party/lz4cli/datagen.o		\
-	o/$(MODE)/third_party/lz4cli/xxhash.o
+	o/$(MODE)/third_party/lz4cli/datagen.o		
 
 o/$(MODE)/third_party/lz4cli/lz4.o			\
 o/$(MODE)/third_party/lz4cli/lz4io.o			\
@@ -42,7 +41,8 @@ THIRD_PARTY_LZ4CLI_DIRECTDEPS =				\
 	LIBC_INTRIN					\
 	LIBC_STDIO					\
 	LIBC_LOG					\
-	LIBC_TIME
+	LIBC_TIME					\
+	THIRD_PARTY_XXHASH
 
 THIRD_PARTY_LZ4CLI_DEPS :=				\
 	$(call uniq,$(foreach x,$(THIRD_PARTY_LZ4CLI_DIRECTDEPS),$($(x))))

diff --git a/third_party/lz4cli/lz4frame.c b/third_party/lz4cli/lz4frame.c
@@ -82,8 +82,7 @@ You can contact the author at :
 #define LZ4_HC_STATIC_LINKING_ONLY
 #include "third_party/lz4cli/lz4hc.h"
 #define XXH_STATIC_LINKING_ONLY
-#include "third_party/lz4cli/xxhash.h"
-
+#include "third_party/xxhash/xxhash.h"
 
 #define LZ4F_STATIC_ASSERT(c)    { enum { LZ4F_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */