Patchwork systemd: depend on libgcrypt

login
register
mail settings
Submitter Enrico Scholz
Date April 18, 2013, 6:09 p.m.
Message ID <1366308596-21123-1-git-send-email-enrico.scholz@sigma-chemnitz.de>
Download mbox | patch
Permalink /patch/48529/
State New
Headers show

Comments

Enrico Scholz - April 18, 2013, 6:09 p.m.
Although libgcrypt support is optional, its development files are
are always required to expand AM_PATH_LIBGCRYPT.  Build might fails else
with

| libtoolize: copying file `m4/lt~obsolete.m4'
| configure.ac:446: warning: macro 'AM_PATH_LIBGCRYPT' not found in library
| ...
| configure.ac:446: error: possibly undefined macro: AM_PATH_LIBGCRYPT
| autoreconf: .../autoconf failed with exit status: 1
| + bbfatal 'autoreconf execution failed.'
| + echo 'ERROR: autoreconf execution failed.'

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 meta/recipes-core/systemd/systemd_199.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Ross Burton - April 18, 2013, 6:14 p.m.
On 18 April 2013 19:09, Enrico Scholz <enrico.scholz@sigma-chemnitz.de> wrote:
> Although libgcrypt support is optional, its development files are
> are always required to expand AM_PATH_LIBGCRYPT.  Build might fails else
> with

This is less than obvious, so please can you add a small comment
inline explaining this before someone "fixes" the libgcrypt dependency
not being in the packageconfig statement.

Ross
Martin Jansa - April 18, 2013, 6:15 p.m.
I've seen the same build issue when rebuilding from sstate-cache, fix looks
good.


On Thu, Apr 18, 2013 at 8:09 PM, Enrico Scholz <
enrico.scholz@sigma-chemnitz.de> wrote:

> Although libgcrypt support is optional, its development files are
> are always required to expand AM_PATH_LIBGCRYPT.  Build might fails else
> with
>
> | libtoolize: copying file `m4/lt~obsolete.m4'
> | configure.ac:446: warning: macro 'AM_PATH_LIBGCRYPT' not found in
> library
> | ...
> | configure.ac:446: error: possibly undefined macro: AM_PATH_LIBGCRYPT
> | autoreconf: .../autoconf failed with exit status: 1
> | + bbfatal 'autoreconf execution failed.'
> | + echo 'ERROR: autoreconf execution failed.'
>
> Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
> ---
>  meta/recipes-core/systemd/systemd_199.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_199.bbb/meta/recipes-core/systemd/
> systemd_199.bb
> index 4fabcc9..2596bdf 100644
> --- a/meta/recipes-core/systemd/systemd_199.bb
> +++ b/meta/recipes-core/systemd/systemd_199.bb
> @@ -11,7 +11,7 @@ PROVIDES = "udev"
>  PE = "1"
>  PR = "r3"
>
> -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native
> acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
> +DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native
> acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
>  DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>
>  SECTION = "base/shell"
> @@ -48,7 +48,7 @@ GTKDOC_DOCDIR = "${S}/docs/"
>
>  PACKAGECONFIG ??= "xz"
>  # Sign the journal for anti-tampering
> -PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
> +PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,,"
>  # Compress the journal
>  PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
>
> --
> 1.8.1.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
index 4fabcc9..2596bdf 100644
--- a/meta/recipes-core/systemd/systemd_199.bb
+++ b/meta/recipes-core/systemd/systemd_199.bb
@@ -11,7 +11,7 @@  PROVIDES = "udev"
 PE = "1"
 PR = "r3"
 
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 libgcrypt"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"
@@ -48,7 +48,7 @@  GTKDOC_DOCDIR = "${S}/docs/"
 
 PACKAGECONFIG ??= "xz"
 # Sign the journal for anti-tampering
-PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
+PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,,"
 # Compress the journal
 PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"