aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-01-17 11:58:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 15:08:09 +0000
commit044f99155bf8775481b70cbe02745c6d9ae1d6a9 (patch)
tree248ac7174ff81fbdc4d1d3f5cd80ce9f176e73b3 /meta/recipes-support/gnutls
parent1b24f76bae9612bc69fb0afeaccb06c5e5746ce6 (diff)
downloadopenembedded-core-contrib-044f99155bf8775481b70cbe02745c6d9ae1d6a9.tar.gz
gnutls: add readline to DEPENDS and add --with-libreadline-prefix
* without this patch it looks for readline in host's /usr/lib a) and fails if readline wasn't built before gnutls, because -I is set and cannot find header file, this case is better configure:33131: checking for readline configure:33156: x86_64-oe-linux-gcc -m64 --sysroot=/OE/oe-core/tmp-eglibc/sysroots/qemux86-64 -std=gnu99 -o conftest -O2 -pipe -g -feliminate-unused-debug-types -I/OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/include -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c /usr/lib/libreadline.so >&5 conftest.c:240:31: fatal error: readline/readline.h: No such file or directory b) and finds usable version there if readline was built and MACHINE is compatible with host (like qemux86-64 on amd64 host) and then it's passing -L/usr/lib (without sysroot prefix) to every build using libgnutls.la configure:33131: checking for readline configure:33156: x86_64-oe-linux-gcc -m64 --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -std=gnu99 -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/libreadline.so >&5 configure:33156: $? = 0 configure:33173: result: yes configure:33185: checking how to link with libreadline configure:33187: result: /usr/lib/libreadline.so configure:33199: checking readline/readline.h usability configure:33199: x86_64-oe-linux-gcc -m64 --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -std=gnu99 -c -O2 -pipe -g -feliminate-unused-debug-types -I/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include conftest.c >&5 configure:33199: $? = 0 configure:33199: result: yes configure:33199: checking readline/readline.h presence configure:33199: x86_64-oe-linux-gcc -E --sysroot=/OE/shr-core/tmp-eglibc/sysroots/qemux86-64 -m64 -I/OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/include conftest.c configure:33199: $? = 0 configure:33199: result: yes configure:33199: checking for readline/readline.h configure:33199: result: yes 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.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index cdcf85b251d..820faf66e9a 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "GNU Transport Layer Security Library"
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline"
INC_PR = "r3"
@@ -24,6 +24,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
--with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
+ --with-libreadline-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
--without-p11-kit \
"