summaryrefslogtreecommitdiff
path: root/atari
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2012-11-10 00:09:11 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2012-11-10 00:11:57 +0000
commit617d655c7bbcccd5168514c9d29e5b329eec63d4 (patch)
treef459e300779ff86740d9233c6a23ee19d2f7ea32 /atari
parent4d58ed656248d975e0394fbfec66215a45e74dfa (diff)
downloadnetsurf-617d655c7bbcccd5168514c9d29e5b329eec63d4.tar.gz
netsurf-617d655c7bbcccd5168514c9d29e5b329eec63d4.tar.bz2
Remove libxml
Diffstat (limited to 'atari')
-rw-r--r--atari/Makefile.target3
-rwxr-xr-xatari/scripts/makelibs.sh34
2 files changed, 1 insertions, 36 deletions
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