From 76d148af6253d52ff64fa5a3cb725611bf32198f Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 2 Jun 2020 01:12:19 -0700
Subject: squashfs-tools-ng: Add zstd support

---
 pkg/squashfs-tools-ng/config.h |  1 +
 pkg/squashfs-tools-ng/gen.lua  |  8 ++++++++
 pkg/zstd/gen.lua               | 12 +++++++++---
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'pkg')

diff --git a/pkg/squashfs-tools-ng/config.h b/pkg/squashfs-tools-ng/config.h
index bc811e65..34ab4524 100644
--- a/pkg/squashfs-tools-ng/config.h
+++ b/pkg/squashfs-tools-ng/config.h
@@ -1,4 +1,5 @@
 #define WITH_GZIP 1
+#define WITH_ZSTD 1
 
 #define HAVE_DLFCN_H 1
 #define HAVE_GETLINE 1
diff --git a/pkg/squashfs-tools-ng/gen.lua b/pkg/squashfs-tools-ng/gen.lua
index 5f438d12..42591d18 100644
--- a/pkg/squashfs-tools-ng/gen.lua
+++ b/pkg/squashfs-tools-ng/gen.lua
@@ -48,6 +48,14 @@ if cfg.WITH_GZIP then
 	})
 end
 
+if cfg.WITH_ZSTD then
+	cflags{'-I $builddir/pkg/zstd/include'}
+	table.insert(srcs, {
+		'lib/sqfs/comp/zstd.c',
+		'$builddir/pkg/zstd/libzstd.a',
+	})
+end
+
 lib('libsquashfs.a', srcs)
 
 lib('libcommon.a', [[
diff --git a/pkg/zstd/gen.lua b/pkg/zstd/gen.lua
index dbbcebee..ccfd9d0f 100644
--- a/pkg/zstd/gen.lua
+++ b/pkg/zstd/gen.lua
@@ -5,9 +5,15 @@ cflags{
 	'-D XXH_NAMESPACE=ZSTD_',
 	'-D ZSTD_NOBENCH',
 	'-D ZSTD_NODICT',
-	'-I $srcdir/lib',
-	'-I $srcdir/lib/common',
-	'-I $srcdir/lib/dictBuilder',
+}
+
+pkg.hdrs = {
+	copy('$outdir/include', '$srcdir/lib', {'zstd.h'}),
+	copy('$outdir/include', '$srcdir/lib/common', {'zstd_errors.h'}),
+	copy('$outdir/include', '$srcdir/lib/dictBuilder', {'zdict.h'}),
+}
+pkg.deps = {
+	'$gendir/headers',
 }
 
 lib('libzstd.a', [[lib/(
-- 
cgit v1.2.3