[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     5c78c3c3681d5651efc568f73f4a7b719006700d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 18:08:53 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 18:08:53 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5c78c3c3

buildsys: fix build when qmanifest is not enabled

- don't refer to qmanifest_main
- don't overlink to needless libs, even when found (like openmp)

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 Makefile.am | 8 +++++---
 applets.h   | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 25afc1b..fc0619c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,14 +69,11 @@ q_SOURCES = \
        qxpak.c \
        $(NULL)
 q_CPPFLAGS = \
-       $(OPENMP_CFLAGS) \
-       $(GPGME_CFLAGS) \
        -I$(top_srcdir)/libq \
        -I$(top_builddir)/autotools/gnulib \
        -I$(top_srcdir)/autotools/gnulib \
        $(NULL)
 q_LDADD = \
-       $(OPENMP_CFLAGS) \
        $(top_builddir)/libq/libq.la \
        $(top_builddir)/autotools/gnulib/libgnu.a \
        -liniparser \
@@ -90,6 +87,11 @@ q_LDADD = \
 
 if QMANIFEST_ENABLED
 q_SOURCES += qmanifest.c
+q_CPPFLAGS += \
+       $(OPENMP_CFLAGS) \
+       $(GPGME_CFLAGS)
+q_LDADD += \
+       $(OPENMP_CFLAGS)
 dist_man_MANS += man/qmanifest.1
 APPLETS += qmanifest
 endif

diff --git a/applets.h b/applets.h
index d8383d4..68bf7f6 100644
--- a/applets.h
+++ b/applets.h
@@ -46,7 +46,9 @@ DECLARE_APPLET(qgrep)
 DECLARE_APPLET(qkeyword)
 DECLARE_APPLET(qlist)
 DECLARE_APPLET(qlop)
+#ifdef HAVE_QMANIFEST
 DECLARE_APPLET(qmanifest)
+#endif
 DECLARE_APPLET(qmerge)
 DECLARE_APPLET(qpkg)
 DECLARE_APPLET(qsearch)
@@ -76,7 +78,9 @@ static const struct applet_t {
        {"qkeyword",  qkeyword_main,  "<action> <args>", "list packages based 
on keywords"},
        {"qlist",     qlist_main,     "<pkgname>",       "list files owned by 
pkgname"},
        {"qlop",      qlop_main,      "<pkgname>",       "emerge log analyzer"},
+#ifdef HAVE_QMANIFEST
        {"qmanifest", qmanifest_main, "<misc args>",     "verify or generate 
thick Manifest files"},
+#endif
        {"qmerge",    qmerge_main,    "<pkgnames>",      "fetch and merge 
binary package"},
        {"qpkg",      qpkg_main,      "<misc args>",     "manipulate Gentoo 
binpkgs"},
        {"qsearch",   qsearch_main,   "<regex>",         "search pkgname/desc"},
@@ -108,9 +112,11 @@ static const struct applet_t {
        /* alias for qtegrity */
        {"integrity", qtegrity_main,  NULL, NULL},
 
+#ifdef HAVE_QMANIFEST
        /* old hashgen */
        {"hashgen",   qmanifest_main, NULL, NULL},
        {"hashverify",qmanifest_main, NULL, NULL},
+#endif
 
        {NULL, NULL, NULL, NULL}
 };