diff --git a/android/external/Makefile.conf b/android/external/Makefile.conf index 81a9b81..8c073c4 100644 --- a/android/external/Makefile.conf +++ b/android/external/Makefile.conf @@ -25,7 +25,6 @@ GMP_VERSION=6.2.1 NETTLE_VERSION=3.7.3 BOOST_VERSION=1.74.0 LIB_ARCHIVE_VERSION=3.6.1 -LIB_XML_VERSION=2.10.0 ### Git deps repos EXTERNAL_GIT_REPOS += libetpan|https://gitea.pep.foundation/pEp.foundation/libetpan.git?507ab94fc9609432ef2d4c62770139482f1b5084 diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile index 529b7df..efbfcdc 100644 --- a/android/external/arm64-v8a/Makefile +++ b/android/external/arm64-v8a/Makefile @@ -316,6 +316,7 @@ libarchive/Makefile: libarchive.src.stamp libarchive-install --disable-documentation \ --disable-bsdtar \ --disable-bsdcpio \ + --without-xml2 \ --host=$(HOST) \ --prefix=$(LOCAL) @@ -329,42 +330,6 @@ libarchive-build: libarchive/libarchive.so libarchive-install: $(LOCAL)/lib/libarchive.so -#------------------------------------------------------------------------------# -# libxml2 - -libxml2.src.stamp: ../downloads/libxml2-$(LIB_XML_VERSION).tar.xz - tar xvf $< - mv libxml2-$(LIB_XML_VERSION) libxml2 - touch $@ - -libxml2-src: libxml2.src.stamp - -libxml2-clean: - rm -rf libxml2 - rm -rf libxml2.src.stamp - -#There is a libxml2 version on the AOSP source code: https://android.googlesource.com/platform/external/libxml2/ -#, maybe it is a good idea to take it from there instead of mainstrem -libxml2/Makefile: libxml2.src.stamp - cd libxml2 && \ - CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure \ - --enable-static \ - --disable-shared \ - --without-lzma \ - --without-zlib \ - --host=$(HOST) \ - --prefix=$(LOCAL) - -libxml2/.libs/libxml2.a: libxml2/Makefile - $(MAKE) -C libxml2 - -$(LOCAL)/lib/libxml2.a: libxml2/.libs/libxml2.a - $(MAKE) -C libxml2 DESTDIR=$(DESTDIR) prefix=$(prefix) install - -libxml2-build: libxml2/.libs/libxml2.a - -libxml2-install: $(LOCAL)/lib/libxml2.a #------------------------------------------------------------------------------# # Sequoia-ffi diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile index b88569c..736d6a4 100644 --- a/android/external/armeabi-v7a/Makefile +++ b/android/external/armeabi-v7a/Makefile @@ -17,7 +17,7 @@ APP_ABI ?= armeabi-v7a all: build #assets -build: showsetup uuid-install sequoia-ffi-install libetpan-build cryptopp-install archive-install +build: showsetup uuid-install sequoia-ffi-install libetpan-build cryptopp-install libarchive-install #------------------------------------------------------------------------------# @@ -319,6 +319,7 @@ libarchive/Makefile: libarchive.src.stamp libarchive-install --disable-documentation \ --disable-bsdtar \ --disable-bsdcpio \ + --without-xml2 \ --host=$(HOST) \ --prefix=$(LOCAL) @@ -332,43 +333,6 @@ libarchive-build: libarchive/libarchive.so libarchive-install: $(LOCAL)/lib/libarchive.so -#------------------------------------------------------------------------------# -# libxml2 - - -libxml2.src.stamp: ../downloads/libxml2-$(LIB_XML_VERSION).tar.xz - tar xvf $< - mv libxml2-$(LIB_XML_VERSION) libxml2 - touch $@ - -libxml2-src: libxml2.src.stamp - -libxml2-clean: - rm -rf libxml2 - rm -rf libxml2.src.stamp - -#There is a libxml2 version on the AOSP source code: https://android.googlesource.com/platform/external/libxml2/ -#, maybe it is a good idea to take it from there instead of mainstrem -libxml2/Makefile: libxml2.src.stamp - cd libxml2 && \ - CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure \ - --enable-static \ - --disable-shared \ - --without-lzma \ - --without-zlib \ - --host=$(HOST) \ - --prefix=$(LOCAL) - -libxml2/.libs/libxml2.a: libxml2/Makefile - $(MAKE) -C libxml2 - -$(LOCAL)/lib/libxml2.a: libxml2/.libs/libxml2.a - $(MAKE) -C libxml2 DESTDIR=$(DESTDIR) prefix=$(prefix) install - -libxml2-build: libxml2/.libs/libxml2.a - -libxml2-install: $(LOCAL)/lib/libxml2.a #------------------------------------------------------------------------------# # Sequoia-ffi CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build diff --git a/android/external/downloads/Makefile b/android/external/downloads/Makefile index d227d39..b27fc12 100644 --- a/android/external/downloads/Makefile +++ b/android/external/downloads/Makefile @@ -14,7 +14,7 @@ include ../Makefile.conf # Build parameters all: download-iconv download-uuid download-sequoia-deps download-etpan download-sequoia download-boost \ - download-cryptopp download-archive download-xml2 + download-cryptopp download-archive download-iconv: libiconv-1.15.tar.gz @@ -33,8 +33,6 @@ download-cryptopp: cryptopp.tar.gz download-archive: libarchive-$(LIB_ARCHIVE_VERSION).tar.gz -download-xml2: libxml2-$(LIB_XML_VERSION).tar.xz - # Download source and patch it libiconv-1.15.tar.gz: wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz @@ -59,11 +57,6 @@ libarchive-$(LIB_ARCHIVE_VERSION).tar.gz: wget -nc https://libarchive.org/downloads/libarchive-$(LIB_ARCHIVE_VERSION).tar.gz md5sum -c libarchive-$(LIB_ARCHIVE_VERSION).tar.gz.md5 -libxml2-$(LIB_XML_VERSION).tar.xz: - wget -nc https://download.gnome.org/sources/libxml2/2.10/libxml2-$(LIB_XML_VERSION).tar.xz - md5sum -c libxml2-$(LIB_XML_VERSION).tar.xz.md5 - - #------------------------------------------------------------------------------# # Clone update and archive external projects GIT repos # Local clone is in external/$project.git while diff --git a/android/external/downloads/libxml2-2.10.0.tar.xz.md5 b/android/external/downloads/libxml2-2.10.0.tar.xz.md5 deleted file mode 100644 index 6f30278..0000000 --- a/android/external/downloads/libxml2-2.10.0.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -54fdcf2404eb5c1ca59ffc82b2edff78 libxml2-2.10.0.tar.xz diff --git a/android/external/x86/Makefile b/android/external/x86/Makefile index fc8eb5c..2225477 100644 --- a/android/external/x86/Makefile +++ b/android/external/x86/Makefile @@ -317,6 +317,7 @@ libarchive/Makefile: libarchive.src.stamp libarchive-install --disable-bsdtar \ --disable-bsdcpio \ --host=$(HOST) \ + --without-xml2 \ --prefix=$(LOCAL) libarchive/libarchive.so: libarchive/Makefile @@ -329,43 +330,6 @@ libarchive-build: libarchive/libarchive.so libarchive-install: $(LOCAL)/lib/libarchive.so -#------------------------------------------------------------------------------# -# libxml2 - - -libxml2.src.stamp: ../downloads/libxml2-$(LIB_XML_VERSION).tar.xz - tar xvf $< - mv libxml2-$(LIB_XML_VERSION) libxml2 - touch $@ - -libxml2-src: libxml2.src.stamp - -libxml2-clean: - rm -rf libxml2 - rm -rf libxml2.src.stamp - -#There is a libxml2 version on the AOSP source code: https://android.googlesource.com/platform/external/libxml2/ -#, maybe it is a good idea to take it from there instead of mainstrem -libxml2/Makefile: libxml2.src.stamp - cd libxml2 && \ - CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure \ - --enable-static \ - --disable-shared \ - --without-lzma \ - --without-zlib \ - --host=$(HOST) \ - --prefix=$(LOCAL) - -libxml2/.libs/libxml2.a: libxml2/Makefile - $(MAKE) -C libxml2 - -$(LOCAL)/lib/libxml2.a: libxml2/.libs/libxml2.a - $(MAKE) -C libxml2 DESTDIR=$(DESTDIR) prefix=$(prefix) install - -libxml2-build: libxml2/.libs/libxml2.a - -libxml2-install: $(LOCAL)/lib/libxml2.a #------------------------------------------------------------------------------# # Sequoia-ffi CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/ diff --git a/android/external/x86_64/Makefile b/android/external/x86_64/Makefile index bcb990b..0fb3842 100644 --- a/android/external/x86_64/Makefile +++ b/android/external/x86_64/Makefile @@ -316,6 +316,7 @@ libarchive/Makefile: libarchive.src.stamp libarchive-install --disable-documentation \ --disable-bsdtar \ --disable-bsdcpio \ + --without-xml2 \ --host=$(HOST) \ --prefix=$(LOCAL) @@ -329,43 +330,6 @@ libarchive-build: libarchive/libarchive.so libarchive-install: $(LOCAL)/lib/libarchive.so -#------------------------------------------------------------------------------# -# libxml2 - - -libxml2.src.stamp: ../downloads/libxml2-$(LIB_XML_VERSION).tar.xz - tar xvf $< - mv libxml2-$(LIB_XML_VERSION) libxml2 - touch $@ - -libxml2-src: libxml2.src.stamp - -libxml2-clean: - rm -rf libxml2 - rm -rf libxml2.src.stamp - -#There is a libxml2 version on the AOSP source code: https://android.googlesource.com/platform/external/libxml2/ -#, maybe it is a good idea to take it from there instead of mainstrem -libxml2/Makefile: libxml2.src.stamp - cd libxml2 && \ - CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ - ./configure \ - --enable-static \ - --disable-shared \ - --without-lzma \ - --without-zlib \ - --host=$(HOST) \ - --prefix=$(LOCAL) - -libxml2/.libs/libxml2.a: libxml2/Makefile - $(MAKE) -C libxml2 - -$(LOCAL)/lib/libxml2.a: libxml2/.libs/libxml2.a - $(MAKE) -C libxml2 DESTDIR=$(DESTDIR) prefix=$(prefix) install - -libxml2-build: libxml2/.libs/libxml2.a - -libxml2-install: $(LOCAL)/lib/libxml2.a #------------------------------------------------------------------------------# # Sequoia-ffi