From e0dd151863ecff3ab33dff068c28f653039b90d3 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sun, 30 Sep 2018 16:54:32 -0400
Subject: [PATCH] remove libxml2 dependency

closes #9
closes #7
---
 Dockerfile                 | 14 +-------------
 llvm-fix-libxml2-dep.patch | 25 -------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 llvm-fix-libxml2-dep.patch

diff --git a/Dockerfile b/Dockerfile
index f6368a2..242730f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,25 +18,13 @@ RUN apk update && \
 RUN mkdir -p /deps
 ARG MAKE_JOBS=-j1
 
-# xml2
-WORKDIR /deps
-RUN wget ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.7.tar.gz
-RUN tar xf libxml2-2.9.7.tar.gz
-WORKDIR /deps/libxml2-2.9.7
-RUN autoreconf
-RUN ./configure --without-python --disable-shared --prefix=/deps/local
-RUN make $MAKE_JOBS install
-
 # llvm
 WORKDIR /deps
 RUN wget http://releases.llvm.org/7.0.0/llvm-7.0.0.src.tar.xz
 RUN tar xf llvm-7.0.0.src.tar.xz
-WORKDIR /deps/llvm-7.0.0.src/
-COPY llvm-fix-libxml2-dep.patch ./
-RUN patch -p0 -i llvm-fix-libxml2-dep.patch
 RUN mkdir -p /deps/llvm-7.0.0.src/build
 WORKDIR /deps/llvm-7.0.0.src/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/deps/local -DCMAKE_PREFIX_PATH=/deps/local -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly;AVR;RISCV"
+RUN cmake .. -DCMAKE_INSTALL_PREFIX=/deps/local -DCMAKE_PREFIX_PATH=/deps/local -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly;AVR;RISCV" -DLLVM_ENABLE_LIBXML2=OFF
 RUN make $MAKE_JOBS install
 
 # clang
diff --git a/llvm-fix-libxml2-dep.patch b/llvm-fix-libxml2-dep.patch
deleted file mode 100644
index 80ba833..0000000
--- a/llvm-fix-libxml2-dep.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: cmake/config-ix.cmake
-===================================================================
---- cmake/config-ix.cmake	(revision 326679)
-+++ cmake/config-ix.cmake	(working copy)
-@@ -153,7 +153,6 @@
-         else()
-           include_directories(${LIBXML2_INCLUDE_DIR})
-         endif()
--        set(LIBXML2_LIBS "xml2")
-       endif()
-     endif()
-   endif()
-Index: lib/WindowsManifest/CMakeLists.txt
-===================================================================
---- lib/WindowsManifest/CMakeLists.txt	(revision 326679)
-+++ lib/WindowsManifest/CMakeLists.txt	(working copy)
-@@ -1,7 +1,7 @@
- set(system_libs)
- if( CMAKE_HOST_UNIX )
-   if( LLVM_LIBXML2_ENABLED )
--    set(system_libs ${system_libs} ${LIBXML2_LIBS})
-+    set(system_libs ${system_libs} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
-   endif()
- endif()
-