Make LibSolv a mandatory package
... so it is actually installed on the image.
This commit is contained in:
parent
7216c8944d
commit
1add554a83
|
@ -215,7 +215,7 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# libsolv
|
# LibSolv
|
||||||
|
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) != x86 {
|
||||||
Echo "Libsolv not available for $(TARGET_ARCH)." ;
|
Echo "Libsolv not available for $(TARGET_ARCH)." ;
|
||||||
|
|
|
@ -36,4 +36,4 @@ OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
|
||||||
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
|
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
|
||||||
OptionalPackageDependencies XZ-Utils : Tar ;
|
OptionalPackageDependencies XZ-Utils : Tar ;
|
||||||
|
|
||||||
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
|
OptionalPackageDependencies MandatoryPackages : ICU LibSolv Sed Tar ;
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
# LibIconv - text encoding conversion library
|
# LibIconv - text encoding conversion library
|
||||||
# LibLayout - GCC2 package needed by some BeOS apps to compile
|
# LibLayout - GCC2 package needed by some BeOS apps to compile
|
||||||
# Libmng - mng support library
|
# Libmng - mng support library
|
||||||
|
# LibSolv - package dependency solver library
|
||||||
# LibXML2 - the XML support library
|
# LibXML2 - the XML support library
|
||||||
# LibXSLT - xslt library and utility
|
# LibXSLT - xslt library and utility
|
||||||
# Links - the web browser
|
# 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
|
# LibXML2
|
||||||
if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
|
if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) != x86 {
|
||||||
|
|
Loading…
Reference in New Issue