brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop building libarchive shared lib

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-18 20:49:48 +01:00
parent e0e718a7b3
commit 2f0ab547ee
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
deps/Makefile vendored
View file

@ -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