diff options
| -rw-r--r-- | recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch | 26 | ||||
| -rw-r--r-- | recipes-sota/ostree/ostree_git.bb | 5 |
2 files changed, 2 insertions, 29 deletions
diff --git a/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch b/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch deleted file mode 100644 index f45bae4..0000000 --- a/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch +++ /dev/null | |||
| @@ -1,26 +0,0 @@ | |||
| 1 | From 666e80acda17680e20d363ddc6fcf0a63f9c1dde Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anton Gerasimov <anton.gerasimov@openmailbox.org> | ||
| 3 | Date: Thu, 21 Dec 2017 22:36:06 +0100 | ||
| 4 | Subject: [PATCH] Allow building without libsoup | ||
| 5 | |||
| 6 | --- | ||
| 7 | configure.ac | 3 --- | ||
| 8 | 1 file changed, 3 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/configure.ac b/configure.ac | ||
| 11 | index 92248af8..baf66e4f 100644 | ||
| 12 | --- a/configure.ac | ||
| 13 | +++ b/configure.ac | ||
| 14 | @@ -182,9 +182,6 @@ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, | ||
| 15 | [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] | ||
| 16 | ) | ||
| 17 | |||
| 18 | -AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ | ||
| 19 | - AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests]) | ||
| 20 | -]) | ||
| 21 | AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno) | ||
| 22 | AS_IF([test x$with_curl != xno || test x$with_soup != xno], | ||
| 23 | [AC_DEFINE([HAVE_LIBCURL_OR_LIBSOUP], 1, [Define if we have soup or curl])]) | ||
| 24 | -- | ||
| 25 | 2.15.0 | ||
| 26 | |||
diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 9ef4478..00559b6 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb | |||
| @@ -6,10 +6,9 @@ inherit autotools-brokensep pkgconfig systemd gobject-introspection | |||
| 6 | 6 | ||
| 7 | INHERIT_remove_class-native = "systemd" | 7 | INHERIT_remove_class-native = "systemd" |
| 8 | 8 | ||
| 9 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master \ | 9 | SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" |
| 10 | file://0001-Allow-building-without-libsoup.patch" | ||
| 11 | 10 | ||
| 12 | SRCREV="ae61321046ad7f4148a5884c8c6c8b2594ff840e" | 11 | SRCREV="854a823e05d6fe8b610c02c2a71eaeb2bf1e98a6" |
| 13 | 12 | ||
| 14 | PV = "v2017.13" | 13 | PV = "v2017.13" |
| 15 | 14 | ||
