diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2010-03-22 18:13:56 +0300 |
| commit | 3937c88166a493900a694ea8fe53b860f4099d83 (patch) | |
| tree | 57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/iksemel | |
| parent | df2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff) | |
| parent | 3510d2ed15a4b477aa7af802a839e11a87b981ed (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/iksemel')
| -rw-r--r-- | recipes/iksemel/iksemel-1.4/r25.diff | 32 | ||||
| -rw-r--r-- | recipes/iksemel/iksemel_1.2.bb | 2 | ||||
| -rw-r--r-- | recipes/iksemel/iksemel_1.4.bb | 15 |
3 files changed, 48 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.2.bb b/recipes/iksemel/iksemel_1.2.bb index 903d8f046d..c393f687d8 100644 --- a/recipes/iksemel/iksemel_1.2.bb +++ b/recipes/iksemel/iksemel_1.2.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL" DESCRIPTION = "A simple, powerful XML-parsing library written in C." SECTION = "libs" PRIORITY = "optional" -DEPENDS = "glibc gnutls" +DEPENDS = "gnutls" PR = "r0" inherit pkgconfig autotools diff --git a/recipes/iksemel/iksemel_1.4.bb b/recipes/iksemel/iksemel_1.4.bb new file mode 100644 index 0000000000..85c1fe969e --- /dev/null +++ b/recipes/iksemel/iksemel_1.4.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Fast and portable XML parser and Jabber protocol library" +AUTHOR = "Gurer Ozen <meduketto at gmail.com>" +HOMEPAGE = "http://iksemel.googlecode.com" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "gnutls" +PR = "r1" + +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" + +inherit autotools_stage pkgconfig |