From 2f0ab547ee1951c4da43e6c28dc976e5631bce26 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 18 Oct 2021 20:49:48 +0100 Subject: [PATCH] Stop building libarchive shared lib Signed-off-by: falkTX --- deps/Makefile | 11 +++++++++-- plugins/todo.txt | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 1d31625..f04552c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -98,9 +98,16 @@ $(DEP_PATH)/lib/%.a: MACHINE=$(MACHINE)$(MACHINE_SUFFIX) \ -C $(DEP_PATH) lib/$*.a -$(DEP_PATH)/lib/libarchive.a: $(DEP_PATH)/lib/libzstd.a +# skip libarchive shared lib +$(DEP_PATH)/lib/libarchive.a: $(DEP_PATH)/lib/libzstd.a $(DEP_PATH)/libarchive-3.4.3/.stamp-patched -$(DEP_PATH)/lib/libarchive_static.a: $(DEP_PATH)/lib/libzstd.a +$(DEP_PATH)/lib/libarchive_static.a: $(DEP_PATH)/lib/libzstd.a $(DEP_PATH)/libarchive-3.4.3/.stamp-patched + +$(DEP_PATH)/libarchive-3.4.3/.stamp-patched: + $(MAKE) -C $(DEP_PATH) libarchive-3.4.3 + sed -i -e "238,243d" $(DEP_PATH)/libarchive-3.4.3/libarchive/CMakeLists.txt + sed -i -e "s/TARGETS archive archive_static/TARGETS archive_static/" $(DEP_PATH)/libarchive-3.4.3/libarchive/CMakeLists.txt + touch $@ ifeq ($(MACOS),true) # zstd cmake is borked, see https://github.com/facebook/zstd/issues/1401 diff --git a/plugins/todo.txt b/plugins/todo.txt index 30d182a..6f32492 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -33,7 +33,10 @@ ArableInstruments 48756.0 squinkylabs-plug1 48682.0 SonusModular 45245.0 LindenbergResearch 43959.0 + Geodesics 42761.0 +https://github.com/MarcBoule/Geodesics + mscHack 42316.0 BaconMusic 42095.0 HetrickCV 42077.0