diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-01-17 11:58:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 15:10:16 +0000 |
| commit | 8773ebef268c88fa214e3db3dbf201cd7f56a031 (patch) | |
| tree | 0ef7f5193433aebea9d008d75a61f75796f38dfa /meta/recipes-support/gnutls | |
| parent | 8ca00617444ab6a919b099c62f58e6ac9c393a89 (diff) | |
| download | poky-8773ebef268c88fa214e3db3dbf201cd7f56a031.tar.gz | |
gnutls.inc: set libz prefix
* without this patch host's zlib is used, similar to issue with
libreadline it's important if host's zlib is compatible with MACHINE
and in this case zlib was in DEPENDS so header was always available in
sysroot
lib/config.log:
configure:18288: checking whether to include zlib compression support
configure:18291: result: yes
configure:18786: checking for libz
configure:18808: x86_64-oe-linux-gcc -m64 --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -o conftest -O2 -pipe -g -feliminate-unused-debug-types -I/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c /usr/lib/libz.so >&5
configure:18808: $? = 0
configure:18818: result: yes
configure:18825: checking how to link with libz
configure:18827: result: /usr/lib/libz.so
(From OE-Core rev: 6d21c87ca37a11b34551d79758da65ed417c70a0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
| -rw-r--r-- | meta/recipes-support/gnutls/gnutls.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 820faf66e9..599154032d 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/" | |||
| 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" | 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" |
| 4 | DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" | 4 | DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" |
| 5 | 5 | ||
| 6 | INC_PR = "r3" | 6 | INC_PR = "r4" |
| 7 | 7 | ||
| 8 | LICENSE = "GPLv3+ & LGPLv2.1+" | 8 | LICENSE = "GPLv3+ & LGPLv2.1+" |
| 9 | LICENSE_${PN} = "LGPLv2.1+" | 9 | LICENSE_${PN} = "LGPLv2.1+" |
| @@ -25,6 +25,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ | |||
| 25 | --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \ | 25 | --with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \ |
| 26 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ | 26 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ |
| 27 | --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \ | 27 | --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \ |
| 28 | --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \ | ||
| 28 | --with-lzo --disable-guile \ | 29 | --with-lzo --disable-guile \ |
| 29 | --without-p11-kit \ | 30 | --without-p11-kit \ |
| 30 | " | 31 | " |