From eed239d897045a93d69461b7c093c9c928518f5f Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 8 Jan 2018 14:41:22 +0100 Subject: Delete dependency on libsoup It makes supporting different platforms somewhat easier --- .../0001-Allow-building-without-libsoup.patch | 26 ++++++++++++++++++++++ recipes-sota/ostree/ostree_git.bb | 7 +++--- .../glib-networking/glib-networking_%.bbappend | 8 ------- recipes-support/libsoup/libsoup-2.4_%.bbappend | 3 --- 4 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch delete mode 100644 recipes-support/glib-networking/glib-networking_%.bbappend delete mode 100644 recipes-support/libsoup/libsoup-2.4_%.bbappend diff --git a/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch b/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch new file mode 100644 index 0000000..f45bae4 --- /dev/null +++ b/recipes-sota/ostree/files/0001-Allow-building-without-libsoup.patch @@ -0,0 +1,26 @@ +From 666e80acda17680e20d363ddc6fcf0a63f9c1dde Mon Sep 17 00:00:00 2001 +From: Anton Gerasimov +Date: Thu, 21 Dec 2017 22:36:06 +0100 +Subject: [PATCH] Allow building without libsoup + +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 92248af8..baf66e4f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -182,9 +182,6 @@ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, + [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] + ) + +-AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ +- AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests]) +-]) + AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno) + AS_IF([test x$with_curl != xno || test x$with_soup != xno], + [AC_DEFINE([HAVE_LIBCURL_OR_LIBSOUP], 1, [Define if we have soup or curl])]) +-- +2.15.0 + diff --git a/recipes-sota/ostree/ostree_git.bb b/recipes-sota/ostree/ostree_git.bb index 724976a..9ef4478 100644 --- a/recipes-sota/ostree/ostree_git.bb +++ b/recipes-sota/ostree/ostree_git.bb @@ -6,7 +6,8 @@ inherit autotools-brokensep pkgconfig systemd gobject-introspection INHERIT_remove_class-native = "systemd" -SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master" +SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master \ + file://0001-Allow-building-without-libsoup.patch" SRCREV="ae61321046ad7f4148a5884c8c6c8b2594ff840e" @@ -16,14 +17,14 @@ S = "${WORKDIR}/git" BBCLASSEXTEND = "native" -DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs gtk-doc-native curl xz" +DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse e2fsprogs gtk-doc-native curl xz" DEPENDS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" DEPENDS_remove_class-native = "systemd-native" RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap bash" RDEPENDS_${PN}_remove_class-native = "python-native" -EXTRA_OECONF = "--with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man --with-smack --with-builtin-grub2-mkconfig --with-curl" +EXTRA_OECONF = "CFLAGS='-Wno-error=missing-prototypes' --with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man --with-smack --with-builtin-grub2-mkconfig --with-curl --without-soup" EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat" # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the diff --git a/recipes-support/glib-networking/glib-networking_%.bbappend b/recipes-support/glib-networking/glib-networking_%.bbappend deleted file mode 100644 index 22e6f05..0000000 --- a/recipes-support/glib-networking/glib-networking_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -BBCLASSEXTEND_append_sota = " native nativesdk" - -# Hackery to prevent relocatable_native_pcfiles from crashing -do_install_append_class-native () { - if [ -d ${D}${libdir}/pkgconfig ]; then - rmdir ${D}${libdir}/pkgconfig - fi -} diff --git a/recipes-support/libsoup/libsoup-2.4_%.bbappend b/recipes-support/libsoup/libsoup-2.4_%.bbappend deleted file mode 100644 index 18383f1..0000000 --- a/recipes-support/libsoup/libsoup-2.4_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -BBCLASSEXTEND_append_sota = " native nativesdk" - -DEPENDS_append_class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ' glib-networking-native', ' ', d)}" -- cgit v1.2.3-54-g00ecf