From 1add554a832a5fdd2bb26692115fd116afecf60c Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 3 Apr 2013 21:04:55 +0200
Subject: [PATCH] Make LibSolv a mandatory package

... so it is actually installed on the image.
---
 build/jam/OptionalBuildFeatures       |  2 +-
 build/jam/OptionalPackageDependencies |  2 +-
 build/jam/OptionalPackages            | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index ee549b0d31..50ac91e77e 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -215,7 +215,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 }
 
 
-# libsolv
+# LibSolv
 
 if $(TARGET_ARCH) != x86 {
 	Echo "Libsolv not available for $(TARGET_ARCH)." ;
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 6604f39430..7a721eb5c2 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -36,4 +36,4 @@ OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
 OptionalPackageDependencies wpa_supplicant : OpenSSL ;
 OptionalPackageDependencies XZ-Utils : Tar ;
 
-OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
+OptionalPackageDependencies MandatoryPackages : ICU LibSolv Sed Tar ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 7865db5ad0..ee2c9abe4b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -44,6 +44,7 @@
 #	LibIconv				- text encoding conversion library
 #	LibLayout				- GCC2 package needed by some BeOS apps to compile
 #	Libmng					- mng support library
+#	LibSolv					- package dependency solver library
 #	LibXML2					- the XML support library
 #	LibXSLT					- xslt library and utility
 #	Links					- the web browser
@@ -918,6 +919,18 @@ if [ IsOptionalHaikuImagePackageAdded Libmng ] {
 }
 
 
+# LibSolv
+if [ IsOptionalHaikuImagePackageAdded LibSolv ] {
+	if ! $(HAIKU_LIBSOLV_PACKAGE) {
+		Echo "No optional package LibSolv available for $(TARGET_ARCH)" ;
+	} else {
+		InstallOptionalHaikuImagePackage $(HAIKU_LIBSOLV_PACKAGE)
+			: $(hpkgBaseURL)/$(HAIKU_LIBSOLV_PACKAGE)
+			: system packages ;
+	}
+}
+
+
 # LibXML2
 if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
 	if $(TARGET_ARCH) != x86 {