| Message ID | 20190813170208.28511-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/gupnp: switch back to autotools | expand |
On Tue, 13 Aug 2019 19:02:08 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Switch back to autotools to fix static build with rygel (and so reverts > partially commit 66a3fbb9f6c79e48eaf9e561a4143063e7e9d670 > "package/gupnp: bump to version 1.0.4"). > > Indeed gupnp uses meson's subproject feature for guul which is just > plainly broken on static build with meson, see: > https://github.com/mesonbuild/meson/issues/3934 > https://github.com/mesonbuild/meson/issues/3937 > https://github.com/mesonbuild/meson/pull/3939 > > This will fix a build failure with rygel > > Fixes: > - http://autobuild.buildroot.org/results/ebbf96a1be5547e416feb1e96e55986890d0a1de > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/gupnp/gupnp.mk | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Applied to master, thanks. Thomas
diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index 02670ac91b..29305f0b4b 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -12,8 +12,5 @@ GUPNP_LICENSE = LGPL-2.0+ GUPNP_LICENSE_FILES = COPYING GUPNP_INSTALL_STAGING = YES GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux -GUPNP_CONF_OPTS = \ - -Dexamples=false \ - -Dintrospection=false -$(eval $(meson-package)) +$(eval $(autotools-package))
Switch back to autotools to fix static build with rygel (and so reverts partially commit 66a3fbb9f6c79e48eaf9e561a4143063e7e9d670 "package/gupnp: bump to version 1.0.4"). Indeed gupnp uses meson's subproject feature for guul which is just plainly broken on static build with meson, see: https://github.com/mesonbuild/meson/issues/3934 https://github.com/mesonbuild/meson/issues/3937 https://github.com/mesonbuild/meson/pull/3939 This will fix a build failure with rygel Fixes: - http://autobuild.buildroot.org/results/ebbf96a1be5547e416feb1e96e55986890d0a1de Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/gupnp/gupnp.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)