Commit e100ee6e authored by Alexandre Janniaux's avatar Alexandre Janniaux
Browse files

contrib: libarchive: switch to cmake

parent c244aa04
Pipeline #55724 failed with stage
in 132 minutes and 1 second
......@@ -14,8 +14,20 @@ LIBARCHIVE_CONF := $(HOSTCONF) \
--without-nettle --without-cng \
--without-xml2 --without-lzma --without-iconv --without-expat
LIBARCHIVE_CONF := \
-DENABLE_CPIO=OFF \
-DENABLE_TAR=OFF \
-DENABLE_CAT=OFF \
-DENABLE_ICONV=OFF \
-DENABLE_NETTLE=OFF \
-DENABLE_LIBXML2=OFF \
-DENABLE_LZMA=OFF \
-DENABLE_CNG=OFF \
-DENABLE_EXPAT=OFF \
-DENABLE_TEST=OFF
ifdef HAVE_WIN32
LIBARCHIVE_CONF += --without-openssl
LIBARCHIVE_CONF += -DENABLE_OPENSSL=OFF
endif
$(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz:
......@@ -38,7 +50,6 @@ endif
$(MOVE)
.libarchive: libarchive
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(LIBARCHIVE_CONF)
cd $< && $(MAKE) install
cd $< && $(HOSTVARS) CXXFLAGS="$(CXXFLAGS) -Icontrib/android/include/" $(CMAKE) $(LIBARCHIVE_CONF)
cd $< && $(CMAKEBUILD) . --target install
touch $@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment