From 617d655c7bbcccd5168514c9d29e5b329eec63d4 Mon Sep 17 00:00:00 2001
From: John-Mark Bell <jmb@netsurf-browser.org>
Date: Sat, 10 Nov 2012 00:09:11 +0000
Subject: Remove libxml

---
 atari/Makefile.target     |  3 +--
 atari/scripts/makelibs.sh | 34 ----------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)

(limited to 'atari')

diff --git a/atari/Makefile.target b/atari/Makefile.target
index 844abfe31..575610cac 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -63,13 +63,12 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \
 		-D_XOPEN_SOURCE=600 \
 		-D_POSIX_C_SOURCE=200112L \
 		$(shell $(PKG_CONFIG) --cflags libhubbub libcss openssl ) \
-		$(shell $(PKG_CONFIG) --cflags libxml-2.0 ) \
 		$(shell $(PKG_CONFIG) --cflags libcurl )
 
 LDFLAGS += -lcflib -lcurl
 LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub
 LDFLAGS += -lssl -lcrypto
-LDFLAGS += -lxml2 -lz -liconv -lcares -lHermes -lwindom -lgem -lm
+LDFLAGS += -lz -liconv -lcares -lHermes -lwindom -lgem -lm
 LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
 
 
diff --git a/atari/scripts/makelibs.sh b/atari/scripts/makelibs.sh
index c479b1ea8..80c316147 100755
--- a/atari/scripts/makelibs.sh
+++ b/atari/scripts/makelibs.sh
@@ -33,7 +33,6 @@ libcurlpkg="curl-7.25.0"
 libfreetypepkg="freetype-2.4.9"
 libhermespkg="Hermes-1.3.3"
 libjpegpkg="jpeg-8b"
-libxmlpkg="libxml2-2.7.8"
 libparserutils_version=0.1.1
 libwapcaplet_version=0.1.1
 hubbub_version=0.1.2
@@ -364,38 +363,6 @@ fi
 
 cd ..
 
-cd $libxmlpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./configure --prefix="$prefix" \
-	--host="m68k-atari-mint" \
-	--without-python \
-	--without-threads \
-	--enable-ipv6=no \
-	--without-debug \
-	--without-http \
-	--without-ftp \
-	--without-legacy \
-	--without-docbook \
-	--without-catalog \
-	--without-regexps \
-	--without-schemas \
-	--without-schematron \
-	--without-sax1 \
-	--without-xpath \
-	--without-modules \
-	--without-c14n \
-	--without-pattern \
-	--without-push \
-	--with-iconv="$archlibdir" \
-	--with-zlib="$archlibdir"
-make
-make install DESTDIR="$userfs"
-else
-echo "no cross"
-fi
-cd ..
 
 cd $libopensslpkg
 $cleanup
@@ -620,6 +587,5 @@ else
 	mv $srcpkgdir $archlibdir -v
 fi
 
-echo "please add symlink to libxml2/libxml within /usr/m68k-atari-mint/include"
 echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
 exit 0
-- 
cgit v1.2.3