1 files changed, 24 insertions, 2 deletions

diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp
index af76c6b29..b6f3e8a87 100644
--- a/toolsrc/src/BinaryParagraph.cpp
+++ b/toolsrc/src/BinaryParagraph.cpp
@@ -16,9 +16,11 @@ namespace vcpkg
 
     namespace Fields
     {
+        static const std::string FEATURE = "Feature";
         static const std::string DESCRIPTION = "Description";
         static const std::string MAINTAINER = "Maintainer";
         static const std::string DEPENDS = "Depends";
+        static const std::string DEFAULTFEATURES = "Default-Features";
     }
 
     BinaryParagraph::BinaryParagraph() = default;
@@ -38,7 +40,10 @@ namespace vcpkg
                              .value_or_exit(VCPKG_LINE_INFO);
         }
 
-        parser.required_field(Fields::VERSION, this->version);
+        // one or the other
+        this->version = parser.optional_field(Fields::VERSION);
+        this->feature = parser.optional_field(Fields::FEATURE);
+
         this->description = parser.optional_field(Fields::DESCRIPTION);
         this->maintainer = parser.optional_field(Fields::MAINTAINER);
 
@@ -46,6 +51,10 @@ namespace vcpkg
         parser.required_field(Fields::MULTI_ARCH, multi_arch);
 
         this->depends = parse_comma_list(parser.optional_field(Fields::DEPENDS));
+        if (this->feature.empty())
+        {
+            this->default_features = parse_comma_list(parser.optional_field(Fields::DEFAULTFEATURES));
+        }
 
         if (auto err = parser.error_info(this->spec.name()))
         {
@@ -66,6 +75,16 @@ namespace vcpkg
         this->depends = filter_dependencies(spgh.depends, triplet);
     }
 
+    BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const FeatureParagraph& fpgh, const Triplet& triplet)
+    {
+        this->spec = PackageSpec::from_name_and_triplet(spgh.name, triplet).value_or_exit(VCPKG_LINE_INFO);
+        this->version = "";
+        this->feature = fpgh.name;
+        this->description = fpgh.description;
+        this->maintainer = "";
+        this->depends = filter_dependencies(fpgh.depends, triplet);
+    }
+
     std::string BinaryParagraph::displayname() const { return this->spec.to_string(); }
 
     std::string BinaryParagraph::dir() const { return this->spec.dir(); }
@@ -78,7 +97,10 @@ namespace vcpkg
     void serialize(const BinaryParagraph& pgh, std::string& out_str)
     {
         out_str.append("Package: ").append(pgh.spec.name()).push_back('\n');
-        out_str.append("Version: ").append(pgh.version).push_back('\n');
+        if (!pgh.version.empty())
+            out_str.append("Version: ").append(pgh.version).push_back('\n');
+        else if (!pgh.feature.empty())
+            out_str.append("Feature: ").append(pgh.feature).push_back('\n');
         if (!pgh.depends.empty())
         {
             out_str.append("Depends: ");