From ac462e80d26e77e74888288351bc44ccb1770a16 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Wed, 15 Jan 2014 02:06:26 +0000 Subject: Remove libxml2 completely: unused since April. --- sdk/Makefile | 21 --------------------- .../patches/libxml2/ppc-amigaos/Makefile.in.p | 14 -------------- 2 files changed, 35 deletions(-) delete mode 100644 sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p (limited to 'sdk') diff --git a/sdk/Makefile b/sdk/Makefile index 140181f..ac57e0a 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -26,7 +26,6 @@ endif VERSION_ZLIB := 1.2.8 VERSION_LIBICONV := 1.14 VERSION_LIBTRE := 0.8.0 -VERSION_LIBXML := 2.9.1 VERSION_OPENSSL := 1.0.1f VERSION_LIBPNG := 1.6.8 VERSION_LIBJPEG := 8d @@ -98,7 +97,6 @@ ifeq ($(TARGET),arm-unknown-riscos) endif ifeq ($(TARGET),m68k-atari-mint) - EXTRAARGS_LIBXML := --enable-ipv6=no SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libcf.d ldg.d windom.d hermes.d freetype.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver @@ -106,7 +104,6 @@ ifeq ($(TARGET),m68k-atari-mint) endif ifeq ($(TARGET),m5475-atari-mint) - EXTRAARGS_LIBXML := --enable-ipv6=no SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libcf.d ldg.d windom.d hermes.d freetype.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver @@ -325,24 +322,6 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/pbl_$(VERSION $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@ -# libXML2 -$(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2-src.d - mkdir -p $(BUILDDIR)/libxml2 - cd $(BUILDDIR)/libxml2 && tar xaf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz - for p in `ls $(RECIPES)/patches/libxml2/*.p` ; do $(PATCH) -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done -ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),) - for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done -endif - cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) CFLAGS=-O2 ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-python $(EXTRAARGS_LIBXML) - cd $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) && $(env) make install - touch $@ - -$(BUILDSTEPS)/libxml2-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz - touch $@ - -$(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "ftp://xmlsoft.org/libxml2/$(subst $(SOURCEDIR)/,,$@)" $@ - # OpenSSL $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d mkdir -p $(BUILDDIR)/openssl diff --git a/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p b/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p deleted file mode 100644 index cd79fee..0000000 --- a/sdk/recipes/patches/libxml2/ppc-amigaos/Makefile.in.p +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.in.old 2011-03-08 21:57:46.000000000 +0000 -+++ Makefile.in 2011-03-08 21:58:04.000000000 +0000 -@@ -41,9 +41,9 @@ - testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \ - testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \ - testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \ -- testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \ -+ testapi$(EXEEXT) testModule$(EXEEXT) \ - runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \ -- runxmlconf$(EXEEXT) testrecurse$(EXEEXT) -+ runxmlconf$(EXEEXT) - bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT) - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ -- cgit v1.2.3