diff options
| author | Dan McGee <dan@archlinux.org> | 2010-05-05 06:42:01 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-05-05 06:42:01 +0200 |
| commit | eb6af031ec83c4c0c1d7e12d1cc8f585197c025f (patch) | |
| tree | 7860f37d4552fa1a66f0dd013cfa935658c71361 | |
| parent | 4f80993933a3feee68758c27c58e9cf5d84bf20e (diff) | |
| download | pacman-eb6af031ec83c4c0c1d7e12d1cc8f585197c025f.tar.gz pacman-eb6af031ec83c4c0c1d7e12d1cc8f585197c025f.tar.xz | |
Build vercmp without needing link to libalpm
Include the object file directly from the libalpm version comparison code as
it is the only thing we need. This drops the dependency of vercmp on
libalpm and all of the stuff we know it drags in.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/util/Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/vercmp.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 638e2764..7dce9dcc 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +vercmp_LDADD = $(top_builddir)/lib/libalpm/version.o testpkg_SOURCES = testpkg.c testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 778ac55a..959dc137 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -23,12 +23,14 @@ #include <stdio.h> /* printf */ #include <string.h> /* strncpy */ -#include <alpm.h> - #define BASENAME "vercmp" #define MAX_LEN 255 +/* forward declaration, comes from vercmp.o in libalpm source that is linked in + * directly so we don't have any library deps */ +int alpm_pkg_vercmp(const char *a, const char *b); + static void usage() { fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); |