commit 23a823f

hovercats  ·  2024-05-02 02:12:19 +0000 UTC
parent bfb9780
zstd: dont need the patch to avoid shared lib
4 files changed,  +9, -59
+9, -8
 1@@ -1,13 +1,14 @@
 2 #!/bin/sh -e
 3 
 4-patch -p1 < drop-shared-libs.patch
 5+make -C lib libzstd.a
 6+make -C lib PREFIX=/usr DESTDIR="$1" install-static
 7+make -C lib PREFIX=/usr DESTDIR="$1" install-includes
 8+make -C lib PREFIX=/usr DESTDIR="$1" install-pc
 9 
10-sed 's/^FLAGS.*=/FLAGS = -static /' programs/Makefile > _
11-mv -f _ programs/Makefile
12-
13-make \
14-    HAVE_LZMA=0 \
15+make -C programs \
16+	HAVE_LZMA=0 \
17     HAVE_ZLIB=0 \
18-    HAVE_LZ4=0
19+    HAVE_LZ4=0 \
20+	LDFLAGS="$LDFLAGS -static"
21 
22-make PREFIX=/usr DESTDIR="$1" install
23+make -C programs PREFIX=/usr DESTDIR="$1" install
+0, -1
1@@ -1,2 +1 @@
2 1d5a2f321553b474179a3c88c00038b1b529087cf5f39fb47445b6b8558ed68457
3-1eb5d6a667a8e10124a948095b47eeb663199ac0dd0acef42d9353841dd3ad040f
+0, -49
 1@@ -1,49 +0,0 @@
 2-diff --git a/lib/Makefile b/lib/Makefile
 3-index ef20218..440e213 100644
 4---- a/lib/Makefile
 5-+++ b/lib/Makefile
 6-@@ -154,19 +154,6 @@ ZSTD_DYNLIB_DIR := $(BUILD_DIR)/dynamic
 7- ZSTD_DYNLIB := $(ZSTD_DYNLIB_DIR)/$(LIBZSTD)
 8- ZSTD_DYNLIB_OBJ := $(addprefix $(ZSTD_DYNLIB_DIR)/,$(ZSTD_LOCAL_OBJ))
 9- 
10--$(ZSTD_DYNLIB): | $(ZSTD_DYNLIB_DIR)
11--$(ZSTD_DYNLIB): $(ZSTD_DYNLIB_OBJ)
12--# Check for multithread flag at target execution time
13--	$(if $(filter -DZSTD_MULTITHREAD,$(CPPFLAGS)),\
14--    @echo compiling multi-threaded dynamic library $(LIBVER),\
15--    @echo compiling single-threaded dynamic library $(LIBVER))
16--	$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
17--	@echo creating versioned links
18--	ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
19--	ln -sf $@ libzstd.$(SHARED_EXT)
20--
21--$(LIBZSTD): $(ZSTD_DYNLIB)
22--	cp -f $< $@
23- 
24- endif  # ifndef BUILD_DIR
25- endif  # if windows
26-@@ -308,7 +295,7 @@ libzstd.pc: libzstd.pc.in
27- 	        $< >$@
28- 
29- .PHONY: install
30--install: install-pc install-static install-shared install-includes
31-+install: install-pc install-static install-includes
32- 	@echo zstd static and shared library installed
33- 
34- .PHONY: install-pc
35-@@ -324,15 +311,6 @@ install-static:
36- 	@echo Installing static library
37- 	$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
38- 
39--.PHONY: install-shared
40--install-shared:
41--	# only generate libzstd.so if it's not already present
42--	[ -e $(LIBZSTD) ] || $(MAKE) libzstd-release
43--	[ -e $(DESTDIR)$(LIBDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
44--	@echo Installing shared library
45--	$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
46--	ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
47--	ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
48- 
49- .PHONY: install-includes
50- install-includes:
+0, -1
1@@ -1,2 +1 @@
2 https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz
3-patches/drop-shared-libs.patch