diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-07-26 16:56:55 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-07-26 17:08:43 +0300 |
| commit | 79b53d4d76bbbb4235eaf709a6f07247f47316de (patch) | |
| tree | 295502ba11139d40fd1621d653b3ac43753590a9 /src/Makefile | |
| parent | 169cb3a97e2ef61b2087278484c8934e0d62cf3d (diff) | |
| download | apk-tools-79b53d4d76bbbb4235eaf709a6f07247f47316de.tar.gz apk-tools-79b53d4d76bbbb4235eaf709a6f07247f47316de.tar.bz2 apk-tools-79b53d4d76bbbb4235eaf709a6f07247f47316de.tar.xz apk-tools-79b53d4d76bbbb4235eaf709a6f07247f47316de.zip | |
solver: new package selection logic (which is not yet used)
* basic code for a backtracking, forward checking dependency satisfier
* works better when there are tricky dependencies to solve
(when can't just upgrade everything to most preferred versions)
* the new code always evaluates all of 'world' constraints
(old code just does incremental updates based on heuristics)
* is probably somewhat slower than old code (probably unnoticeable
difference in most cases)
* makes easier to write support for provides and repository pinning
* test applet and a bunch of test cases added which uses the new code
* from the old feature set install_if is not yet implemented
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index deb6732..1f4e90e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,7 +23,13 @@ apk-objs := apk.o add.o del.o fix.o update.o info.o \ audit.o verify.o dot.o libapk.so-objs := common.o state.o database.o package.o archive.o \ - version.o io.o url.o gunzip.o blob.o hash.o print.o + version.o io.o url.o gunzip.o blob.o hash.o print.o \ + solver.o topology.o + +ifeq ($(TEST),y) +progs-y += apk_test +apk_test-objs := apk.o test.o $(libapk.so-objs) +endif ifeq ($(SHARED_LIBAPK),) apk-objs += $(libapk.so-objs) @@ -47,15 +53,16 @@ progs-$(STATIC) += apk.static apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o LDFLAGS_apk.static := -static LDFLAGS_apk += -nopie -L$(obj) +LDFLAGS_apk_test += -nopie -L$(obj) CFLAGS_ALL += $(shell pkg-config --cflags $(PKGDEPS)) LIBS := -Wl,--as-needed \ $(shell pkg-config --libs $(PKGDEPS)) \ -Wl,--no-as-needed -$(obj)/apk: $(LIBAPK-y) +$(obj)/apk: $(LIBAPK-y) -$(obj)/apk.so: $(obj)/libapk.so +$(obj)/apk.so: $(obj)/libapk.so install: $(obj)/apk $(LIBAPK-y) $(LUA_LIB-y) $(INSTALLDIR) $(DESTDIR)$(SBINDIR) |