Skip to content

Commit

Permalink
disable build of the solv tool for unsupported system types
Browse files Browse the repository at this point in the history
Also gets rid of the no longer used NOSYSTEM.
  • Loading branch information
mlschroe committed Nov 7, 2014
1 parent a4a4a37 commit 5cd3085
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ ENDIF (HAIKU)

IF (${have_system} STREQUAL x)
MESSAGE (STATUS "Building for no system")
ADD_DEFINITIONS (-DNOSYSTEM)
ENDIF (${have_system} STREQUAL x)
IF (${have_system} STRGREATER xx)
MESSAGE (FATAL_ERROR "Can only compile for one system type.")
Expand Down
4 changes: 4 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
IF (SUSE OR FEDORA OR DEBIAN)

ADD_EXECUTABLE (solv solv.c)
TARGET_LINK_LIBRARIES (solv libsolvext libsolv ${SYSTEM_LIBRARIES})

INSTALL(TARGETS
solv
DESTINATION ${BIN_INSTALL_DIR})

ENDIF (SUSE OR FEDORA OR DEBIAN)
16 changes: 1 addition & 15 deletions examples/solv.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,13 @@ yum_substitute(Pool *pool, char *line)
#define TYPE_PLAINDIR 3
#define TYPE_DEBIAN 4

#ifndef NOSYSTEM
static int
read_repoinfos_sort(const void *ap, const void *bp)
{
const struct repoinfo *a = ap;
const struct repoinfo *b = bp;
return strcmp(a->alias, b->alias);
}
#endif

#if defined(SUSE) || defined(FEDORA)

Expand Down Expand Up @@ -478,15 +476,6 @@ read_repoinfos(Pool *pool, int *nrepoinfosp)

#endif

#ifdef NOSYSTEM
struct repoinfo *
read_repoinfos(Pool *pool, int *nrepoinfosp)
{
*nrepoinfosp = 0;
return 0;
}
#endif


void
free_repoinfos(struct repoinfo *repoinfos, int nrepoinfos)
Expand Down Expand Up @@ -1733,6 +1722,7 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
#endif

repo = repo_create(pool, "@System");
memset(&stb, 0, sizeof(stb));
#if defined(ENABLE_RPMDB) && (defined(SUSE) || defined(FEDORA))
printf("rpm database:");
if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/rpm/Packages"), &stb))
Expand All @@ -1742,10 +1732,6 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
printf("dpgk database:");
if (stat(pool_prepend_rootdir_tmp(pool, "/var/lib/dpkg/status"), &stb))
memset(&stb, 0, sizeof(stb));
#endif
#ifdef NOSYSTEM
printf("no installed database:");
memset(&stb, 0, sizeof(stb));
#endif
calc_checksum_stat(&stb, REPOKEY_TYPE_SHA256, 0, installedcookie);
if (usecachedrepo(repo, 0, installedcookie, 0))
Expand Down

0 comments on commit 5cd3085

Please sign in to comment.