diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index b90eaee75a..dc0a3b54b3 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -11,9 +11,6 @@ STUBDOM_TARGETS := @STUBDOM_TARGETS@ STUBDOM_BUILD := @STUBDOM_BUILD@ STUBDOM_INSTALL := @STUBDOM_INSTALL@ -ZLIB_VERSION := @ZLIB_VERSION@ -ZLIB_URL := @ZLIB_URL@ - NEWLIB_VERSION := @NEWLIB_VERSION@ NEWLIB_URL := @NEWLIB_URL@ diff --git a/stubdom/.gitignore b/stubdom/.gitignore index 8c6dc00f83..e5d5744361 100644 --- a/stubdom/.gitignore +++ b/stubdom/.gitignore @@ -29,4 +29,3 @@ /vtpm/vtpm_manager.h /xenstore /xenstorepvh -/zlib-* diff --git a/stubdom/Makefile b/stubdom/Makefile index 254f8d2fc8..164694dd14 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -102,26 +102,6 @@ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) $(MAKE) DESTDIR= && \ $(MAKE) DESTDIR= install ) -############ -# Cross-zlib -############ - -zlib-$(ZLIB_VERSION).tar.gz: - $(FETCHER) $@ $(ZLIB_URL)/$@ - -zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz - tar xzf $< - mv zlib-$(ZLIB_VERSION) $@ - -ZLIB_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libz.a -.PHONY: cross-zlib -cross-zlib: $(ZLIB_STAMPFILE) -$(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) - ( cd $< && \ - CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \ - $(MAKE) DESTDIR= libz.a && \ - $(MAKE) DESTDIR= install ) - ####################################################################### # There used to be a slightly modified version of pciutils, this is now # available under https://github.com/pciutils/pciutils/pull/236 @@ -227,7 +207,7 @@ cross-tpmemu: $(TPMEMU_STAMPFILE) ####### .PHONY: $(CROSS_ROOT) -$(CROSS_ROOT): cross-newlib cross-zlib +$(CROSS_ROOT): cross-newlib ####### # libraries under tools/libs @@ -454,7 +434,6 @@ clean: crossclean: clean rm -fr $(CROSS_ROOT) rm -fr newlib-$(XEN_TARGET_ARCH) - rm -fr zlib-$(XEN_TARGET_ARCH) rm -fr libs-$(XEN_TARGET_ARCH) rm -fr xenstore xenstorepvh rm -fr gmp-$(XEN_TARGET_ARCH) @@ -476,7 +455,6 @@ patchclean: crossclean .PHONY: downloadclean downloadclean: patchclean rm -f newlib-$(NEWLIB_VERSION).tar.gz - rm -f zlib-$(ZLIB_VERSION).tar.gz rm -f gmp-$(GMP_VERSION).tar.bz2 rm -f tpm_emulator-$(TPMEMU_VERSION).tar.gz rm -f lwip-$(LWIP_VERSION).tar.gz diff --git a/stubdom/configure b/stubdom/configure index f3d63dceff..1a5687d32b 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -634,8 +634,6 @@ LWIP_VERSION LWIP_URL NEWLIB_VERSION NEWLIB_URL -ZLIB_VERSION -ZLIB_URL INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM @@ -722,7 +720,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -ZLIB_URL NEWLIB_URL LWIP_URL GMP_URL @@ -1372,7 +1369,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - ZLIB_URL Download url for zlib NEWLIB_URL Download url for newlib LWIP_URL Download url for lwip GMP_URL Download url for libgmp @@ -4023,17 +4019,6 @@ fi # Stubdom libraries version and url setup -if test "x$ZLIB_URL" = "x" -then : - - ZLIB_URL=\$\(XEN_EXTFILES_URL\) -fi -ZLIB_VERSION="1.2.3" - - - - - if test "x$NEWLIB_URL" = "x" then : diff --git a/stubdom/configure.ac b/stubdom/configure.ac index d3d2a840d3..34a47c95e1 100644 --- a/stubdom/configure.ac +++ b/stubdom/configure.ac @@ -38,7 +38,6 @@ AC_PROG_INSTALL AX_DEPENDS_PATH_PROG([vtpm], [CMAKE], [cmake]) # Stubdom libraries version and url setup -AX_STUBDOM_LIB([ZLIB], [zlib], [1.2.3]) AX_STUBDOM_LIB([NEWLIB], [newlib], [1.16.0], [https://sourceware.org/ftp/newlib]) AX_STUBDOM_LIB([LWIP], [lwip], [1.3.0], [https://download.savannah.gnu.org/releases/lwip]) AX_STUBDOM_LIB([GMP], [libgmp], [4.3.2], [https://gmplib.org/download/gmp/archive])