wip

lib/spack/spack/solver/asp.py

@@ -763,20 +763,6 @@ def on_model(model):
             for _, msg, args in errors:
                 self.handle_error(msg, *args)
 
-            providers = [(name, tuple(rest)) for name, *rest in extract_args(best_model, "provider")]
-            possible_providers = [(name, tuple(rest)) for name, *rest in extract_args(best_model, "possible_provider")]
-            virtual_condition_holds = [(name, tuple(rest)) for name, *rest in extract_args(best_model, "virtual_condition_holds")]
-            provider_condition = [(name, tuple(rest)) for name, *rest in extract_args(best_model, "provider_condition")]
-
-            for p in providers:
-                print("provider", p)
-            for pp in possible_providers:
-                print("possible_provider", p)
-            for vch in virtual_condition_holds:
-                print("virtual_condition_holds", vch)
-            for vc in provider_condition:
-                print("virtual_condition", vc)
-            
             # build specs from spec attributes in the model
             spec_attrs = [(name, tuple(rest)) for name, *rest in extract_args(best_model, "attr")]
             answers = builder.build_specs(spec_attrs)

lib/spack/spack/solver/concretize.lp

@@ -1325,7 +1325,7 @@ opt_criterion(100, "number of packages to build (vs. reuse)").
 #defined optimize_for_reuse/0.
 
 #minimize { 0@99: #true }.
-#minimize { PSID@99,Package : attr("node", (Package, PSID)) }.
+#minimize { PSID@99,Package,PSID : attr("node", (Package, PSID)) }.
 
 % A condition group specifies one or more specs that must be satisfied.
 % Specs declared first are preferred, so we assign increasing weights and

lib/spack/spack/solver/display.lp

@@ -29,4 +29,12 @@
 #show provider/2.
 #show virtual_condition_holds/2.
 #show provider_condition/3.
-#show possible_provider/2.
+#show possible_provider/2.
+#show dependency_condition/3.
+#show condition_holds/1.
+#show condition_requirement/3.
+#show condition_requirement/4.
+#show condition_requirement/5.
+#show condition_requirement/6.
+#show dependency_holds/3.
+#show dependency_type/2.

var/spack/repos/builtin/packages/zlib/package.py

@@ -57,6 +57,7 @@ class Zlib(MakefilePackage, Package):
     patch("configure-cc.patch", when="@1.2.12")
 
     depends_on("pkgconf@:1.7", type="build")
+#    depends_on("pkgconfig", type="build")
 
     @property
     def libs(self):