[jhbuild] core-deps-3.26: fix libbytesize and libblockdev build
- From: Alberts MuktupÄvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] core-deps-3.26: fix libbytesize and libblockdev build
- Date: Sun, 6 Aug 2017 14:43:36 +0000 (UTC)
commit 1e58ee19ab3fcdf909ff467ad36b15503f3f1398
Author: Alberts MuktupÄvels <alberts muktupavels gmail com>
Date: Sun Aug 6 17:17:10 2017 +0300
core-deps-3.26: fix libbytesize and libblockdev build
autogen.sh of these two modules does not execute generated
configure script. Use custom autogen template to execute both
scripts - autogen.sh and configure.
Note that previous attempt to use patches did not work because
these modules are not built from tarballs.
modulesets/gnome-suites-core-deps-3.26.modules | 16 ++++++++--------
patches/libblockdev-autogen-configure.patch | 17 -----------------
patches/libbytesize-autogen-configure.patch | 17 -----------------
3 files changed, 8 insertions(+), 42 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index 2e4382f..05367f6 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -1077,10 +1077,10 @@
</suggests>
</meson>
- <autotools id="libblockdev" autogenargs="--without-gtk-doc">
- <branch repo="github.com" module="storaged-project/libblockdev">
- <patch file="libblockdev-autogen-configure.patch" strip="1"/>
- </branch>
+ <autotools id="libblockdev"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix=%(prefix)s
%(autogenargs)s"
+ autogenargs="--without-gtk-doc">
+ <branch repo="github.com" module="storaged-project/libblockdev"/>
<dependencies>
<dep package="pygobject"/>
<dep package="m4-common"/>
@@ -1089,10 +1089,10 @@
</dependencies>
</autotools>
- <autotools id="libbytesize" autogenargs="--without-gtk-doc">
- <branch repo="github.com" module="rhinstaller/libbytesize">
- <patch file="libbytesize-autogen-configure.patch" strip="1"/>
- </branch>
+ <autotools id="libbytesize"
+ autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix=%(prefix)s
%(autogenargs)s"
+ autogenargs="--without-gtk-doc">
+ <branch repo="github.com" module="rhinstaller/libbytesize"/>
<dependencies>
<dep package="m4-common"/>
</dependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]