From b8c44536ca911418fee1c9ab4eecbb913a1ca852 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 11 Jun 2013 14:06:06 +0300 Subject: solver: rewrite as deductive solver -- core features Implementing basic dependency handling, install_if and awareness of pinning. --- src/apk_package.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/apk_package.h') diff --git a/src/apk_package.h b/src/apk_package.h index a91e3e3..55e6ceb 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -15,6 +15,7 @@ #include "apk_version.h" #include "apk_hash.h" #include "apk_io.h" +#include "apk_solver_data.h" struct apk_database; struct apk_name; @@ -60,7 +61,6 @@ struct apk_sign_ctx { struct apk_dependency { struct apk_name *name; apk_blob_t *version; - unsigned solver_state : 22; unsigned repository_tag : 6; unsigned conflict : 1; unsigned result_mask : 3; @@ -86,6 +86,7 @@ struct apk_installed_package { struct apk_package { apk_hash_node hash_node; union { + struct apk_solver_package_state ss; int state_int; void *state_ptr; }; @@ -98,7 +99,6 @@ struct apk_package { struct apk_dependency_array *depends, *install_if, *provides; size_t installed_size, size; time_t build_time; - unsigned int topology_hard; unsigned repos : APK_MAX_REPOS; struct apk_checksum csum; }; -- cgit v1.2.3-60-g2f50