From 5e25bc92779bb55ba80fc16deee6204bce6bf240 Mon Sep 17 00:00:00 2001
From: Florent Rougon <f.rougon@free.fr>
Date: Thu, 11 Apr 2019 10:31:02 +0200
Subject: [PATCH] download_and_compile.sh: don't attempt to install
libcppunit-dev anymore
According to Edward, installing the system CppUnit library is not really
useful and likely to cause problems.[1]
This reverts commit 6caf43f9e7c44c2c1ba49dcab7280f5caa831e48.
[1] https://sourceforge.net/p/flightgear/mailman/message/36636483/
---
download_and_compile.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/download_and_compile.sh b/download_and_compile.sh
index 6a5e4f0..09e2123 100755
--- a/download_and_compile.sh
+++ b/download_and_compile.sh
@@ -635,10 +635,6 @@ if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then
if _elementIn "FGFS" "${WHATTOBUILD[@]}"; then
PKG+=(libopenal-dev libudev-dev libdbus-1-dev libplib-dev)
_mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev
- # CppUnit is shipped with the FG sources, but if installed via the distro
- # package manager, 1) the FG build will be quicker and 2) libcppunit-dev
- # will be updated like other distro packages (e.g., security updates).
- _optional_pkg_alternative libcppunit-dev
# The following packages are needed for the built-in launcher
_optional_pkg_alternative qt5-default
_optional_pkg_alternative qtdeclarative5-dev