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

Merge pull request #1912 from akiernan/us-fix-trivial-httpd 

Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD
This commit is contained in:
OpenShift Merge Robot 2019-10-16 20:15:56 +02:00 committed by GitHub
parent 38729a4f90 83d44ac20a
commit c943bf40b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-ostree.am
View File

@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
endif endif
if USE_LIBSOUP if USE_LIBSOUP
# Eventually once we stop things from using this, we should support disabling this if BUILDOPT_TRIVIAL_HTTPD
ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
pkglibexec_PROGRAMS += ostree-trivial-httpd pkglibexec_PROGRAMS += ostree-trivial-httpd
ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
endif
if !USE_CURL if !USE_CURL
# This is necessary for the cookie jar bits # This is necessary for the cookie jar bits

1
Makefile.am
View File

@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \
--enable-gtk-doc \ --enable-gtk-doc \
--enable-man \ --enable-man \
--disable-maintainer-mode \ --disable-maintainer-mode \
--enable-trivial-httpd-cmdline \
$(NULL) $(NULL)
GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make

5
ci/build.sh
View File

@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in
fi fi
;; ;;
esac esac
# unless libsoup is disabled, enable trivial-httpd for the tests
case "${CONFIGOPTS:-}" in
*--without-soup*) ;;
*) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;;
esac
# always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
# NB: this disables the default set of flags from configure.ac # NB: this disables the default set of flags from configure.ac

1
ci/travis-build.sh
View File

@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
../configure \ ../configure \
--enable-always-build-tests \ --enable-always-build-tests \
--enable-trivial-httpd-cmdline \
${ci_configopts} ${ci_configopts}
"$@" "$@"

3
configure.ac
View File

@ -195,6 +195,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline,
[Continue to support "ostree trivial-httpd" [default=no]])],, [Continue to support "ostree trivial-httpd" [default=no]])],,
enable_trivial_httpd_cmdline=no) enable_trivial_httpd_cmdline=no)
AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [
AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd])
])
AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
[AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
) )