packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Look for /usr/bin/gpgv2 vs /usr/bin/gpgv 

For some reason, RHEL has gpgv, but Fedora doesn't.  We need to detect
which to use, since presumably Debian only has gpgv.
This commit is contained in:
Colin Walters 2014-01-30 19:32:59 -05:00
parent f36cc6a44c
commit c7bcfc1c61
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-libostree.am
View File

@ -77,7 +77,7 @@ libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
$(NULL) $(NULL)
endif endif
libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_' libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS)

2
configure.ac
View File

@ -101,6 +101,8 @@ AS_IF([ test x$with_gpgme != xno ], [
AS_IF([ test x$have_gpgme = xyes], [ AS_IF([ test x$have_gpgme = xyes], [
AC_DEFINE(HAVE_GPGME, 1, [Define if we have gpgme]) AC_DEFINE(HAVE_GPGME, 1, [Define if we have gpgme])
with_gpgme=yes with_gpgme=yes
AC_PATH_PROG(GPGVPATH, [gpgv2 gpgv])
AC_SUBST(GPGVPATH)
], [ with_gpgme=no ]) ], [ with_gpgme=no ])
], [ with_gpgme=no ]) ], [ with_gpgme=no ])
if test x$with_gpgme != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +gpgme"; fi if test x$with_gpgme != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +gpgme"; fi

2
src/libostree/ostree-gpg-verifier.c
View File

@ -183,7 +183,7 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self,
g_main_context_push_thread_default (maincontext); g_main_context_push_thread_default (maincontext);
context = gs_subprocess_context_newv ("gpgv", NULL); context = gs_subprocess_context_newv (GPGVPATH, NULL);
gs_subprocess_context_set_stdin_disposition (context, gs_subprocess_context_set_stdin_disposition (context,
GS_SUBPROCESS_STREAM_DISPOSITION_NULL); GS_SUBPROCESS_STREAM_DISPOSITION_NULL);
gs_subprocess_context_set_stdout_disposition (context, gs_subprocess_context_set_stdout_disposition (context,