diff options
| author |   Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-08 13:01:45 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2010-03-09 18:34:20 +0100 |
| commit | 6b128e9173588dbc744a7afbc27498f980665912 (patch) | |
| tree | 095b3632792190a4cf725758a26b0e22b7b99152 /recipes/iksemel | |
| parent | faae84f59f27cb13fc83a6ad87d360fabf20024f (diff) | |
| download | openembedded-6b128e9173588dbc744a7afbc27498f980665912.tar.gz | |
iksemel: make it build with GnuTLS 2.8.5 - from upstream SVN
Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Diffstat (limited to 'recipes/iksemel')
| -rw-r--r-- | recipes/iksemel/iksemel-1.4/r25.diff | 32 | ||||
| -rw-r--r-- | recipes/iksemel/iksemel_1.4.bb | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/recipes/iksemel/iksemel-1.4/r25.diff b/recipes/iksemel/iksemel-1.4/r25.diff new file mode 100644 index 0000000000..e666ce07b6 --- /dev/null +++ b/recipes/iksemel/iksemel-1.4/r25.diff @@ -0,0 +1,32 @@ +Taken from upstream subversion repository: + +http://code.google.com/p/iksemel/source/detail?r=25 + +=================================================================== +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +--- iksemel-1.4.orig/configure.ac ++++ iksemel-1.4/configure.ac +@@ -43,11 +43,19 @@ AM_CONDITIONAL(DO_POSIX, test "x$defio" + dnl Checks for library functions + AC_SEARCH_LIBS(recv,socket) + AC_CHECK_FUNCS(getopt_long) + AC_CHECK_FUNCS(getaddrinfo) + +-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls")) ++dnl Check GNU TLS ++PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) ++if test "x$have_gnutls" = "xyes"; then ++ LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS" ++ LIBGNUTLS_LIBS="$GNUTLS_LIBS" ++ AC_SUBST(LIBGNUTLS_CFLAGS) ++ AC_SUBST(LIBGNUTLS_LIBS) ++ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) ++fi + + dnl Check -Wall flag of GCC + if test "x$GCC" = "xyes"; then + if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then + CFLAGS="$CFLAGS -Wall" diff --git a/recipes/iksemel/iksemel_1.4.bb b/recipes/iksemel/iksemel_1.4.bb index 2915f59450..85c1fe969e 100644 --- a/recipes/iksemel/iksemel_1.4.bb +++ b/recipes/iksemel/iksemel_1.4.bb @@ -5,8 +5,10 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "gnutls" +PR = "r1" -SRC_URI = "http://iksemel.googlecode.com/files/${P}.tar.gz;name=archive" +SRC_URI = "http://iksemel.googlecode.com/files/${P}.tar.gz;name=archive \ + file://r25.diff;patch=1" SRC_URI[archive.md5sum] = "532e77181694f87ad5eb59435d11c1ca" SRC_URI[archive.sha256sum] = "458c1b8fb3349076a6cecf26c29db1d561315d84e16bfcfba419f327f502e244" |