From c2cb39afca552b5533f31fd35c8fce4cf655f613 Mon Sep 17 00:00:00 2001
From: Axel <axellopez92@outlook.com>
Date: Wed, 30 Sep 2020 09:42:52 +0200
Subject: [PATCH] Removed libxerces-c from prerequisites and documentation

---
 Docs/build_linux.md                  | 8 ++++----
 PythonAPI/carla/setup.py             | 4 ++--
 Util/Docker/Prerequisites.Dockerfile | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Docs/build_linux.md b/Docs/build_linux.md
index 79377a4c9..e65b67f6d 100644
--- a/Docs/build_linux.md
+++ b/Docs/build_linux.md
@@ -33,12 +33,12 @@ sudo apt-add-repository "deb http://apt.llvm.org/$(lsb_release -c --short)/ llvm
 sudo apt-get update
 
 # Additional dependencies for Ubuntu 18.04
-sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev libxerces-c-dev &&
+sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev &&
 pip2 install --user setuptools &&
 pip3 install --user -Iv setuptools==47.3.1
 
 # Additional dependencies for previous Ubuntu versions
-sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng16-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev libxerces-c-dev &&
+sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng16-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev &&
 pip2 install --user setuptools &&
 pip3 install --user -Iv setuptools==47.3.1 &&
 pip2 install --user distro &&
@@ -124,7 +124,7 @@ sudo apt-get update
 
 __Ubuntu 18.04__.
 ```sh
-sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev libxerces-c-dev &&
+sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev &&
 pip2 install --user setuptools &&
 pip3 install --user -Iv setuptools==47.3.1 &&
 pip2 install --user distro &&
@@ -132,7 +132,7 @@ pip3 install --user distro
 ```
 __Previous Ubuntu__ versions.
 ```sh
-sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng16-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev libxerces-c-dev &&
+sudo apt-get install build-essential clang-8 lld-8 g++-7 cmake ninja-build libvulkan1 python python-pip python-dev python3-dev python3-pip libpng16-dev libtiff5-dev libjpeg-dev tzdata sed curl unzip autoconf libtool rsync libxml2-dev &&
 pip2 install --user setuptools &&
 pip3 install --user -Iv setuptools==47.3.1 &&
 pip2 install --user distro &&
diff --git a/PythonAPI/carla/setup.py b/PythonAPI/carla/setup.py
index 987c44522..75ecb8d2b 100755
--- a/PythonAPI/carla/setup.py
+++ b/PythonAPI/carla/setup.py
@@ -51,8 +51,8 @@ def get_libcarla_extensions():
                 os.path.join(pwd, 'dependencies/lib/libRecast.a'),
                 os.path.join(pwd, 'dependencies/lib/libDetour.a'),
                 os.path.join(pwd, 'dependencies/lib/libDetourCrowd.a'),
-                os.path.join(pwd, 'dependencies/lib/libosm2odr.a')]
-            extra_link_args += [os.path.join(pwd, 'dependencies/lib/libxerces-c.a')]
+                os.path.join(pwd, 'dependencies/lib/libosm2odr.a'),
+                os.path.join(pwd, 'dependencies/lib/libxerces-c.a')]
             extra_link_args += ['-lz']
             extra_compile_args = [
                 '-isystem', 'dependencies/include/system', '-fPIC', '-std=c++14',
diff --git a/Util/Docker/Prerequisites.Dockerfile b/Util/Docker/Prerequisites.Dockerfile
index b6db6c976..75d53e94b 100644
--- a/Util/Docker/Prerequisites.Dockerfile
+++ b/Util/Docker/Prerequisites.Dockerfile
@@ -34,8 +34,7 @@ RUN apt-get update ; \
     libtool \
     rsync \
     libxml2-dev \
-    aria2 \
-    libxerces-c-dev && \
+    aria2 && \
   pip3 install -Iv setuptools==47.3.1 && \
   pip3 install distro && \
   update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-8/bin/clang++ 180 && \