diff options
| author | Joshua Lock <josh@linux.intel.com> | 2008-11-06 16:24:30 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2008-11-06 16:24:30 +0000 |
| commit | 47b05dab4873022016b2063c6049885a43131422 (patch) | |
| tree | 6191e1976b0a53a873028ba915d787b1c9711ed8 | |
| parent | 1e6f21407fb80832473efa38875c232bce89d32f (diff) | |
| download | poky-47b05dab4873022016b2063c6049885a43131422.tar.gz | |
gnet from OE plus a configure fix for cross-compile environments.
| -rw-r--r-- | meta/packages/gnet/files/buildfix.patch | 13 | ||||
| -rw-r--r-- | meta/packages/gnet/files/configure_fix.patch | 58 | ||||
| -rw-r--r-- | meta/packages/gnet/gnet_svn.bb | 22 |
3 files changed, 93 insertions, 0 deletions
diff --git a/meta/packages/gnet/files/buildfix.patch b/meta/packages/gnet/files/buildfix.patch new file mode 100644 index 0000000000..8067620264 --- /dev/null +++ b/meta/packages/gnet/files/buildfix.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | Index: gnet/examples/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- gnet.orig/examples/Makefile.am | ||
| 4 | +++ gnet/examples/Makefile.am | ||
| 5 | @@ -2,7 +2,7 @@ | ||
| 6 | |||
| 7 | @SET_MAKE@ | ||
| 8 | |||
| 9 | -SUBDIRS = xmlrpc | ||
| 10 | +SUBDIRS = | ||
| 11 | |||
| 12 | if OS_WIN32 | ||
| 13 | noinst_PROGRAMS = echoclient echoserver \ | ||
diff --git a/meta/packages/gnet/files/configure_fix.patch b/meta/packages/gnet/files/configure_fix.patch new file mode 100644 index 0000000000..e6aadcc6a9 --- /dev/null +++ b/meta/packages/gnet/files/configure_fix.patch | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | Index: trunk/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- trunk.orig/configure.ac | ||
| 4 | +++ trunk/configure.ac | ||
| 5 | @@ -332,53 +332,6 @@ AC_DEFINE_UNQUOTED(GNET_SOCKADDR_FAMILY_ | ||
| 6 | [$gnet_sockaddr_family_field_name], | ||
| 7 | [Name of sockaddr_storage family field]) | ||
| 8 | |||
| 9 | -dnl ####################################### | ||
| 10 | -dnl Check if abstract sockets are supported | ||
| 11 | -dnl ####################################### | ||
| 12 | - | ||
| 13 | -AC_LANG_PUSH(C) | ||
| 14 | -AC_CACHE_CHECK([for abstract socket namespace availability], | ||
| 15 | - ac_cv_gnet_have_abstract_sockets, | ||
| 16 | - [AC_RUN_IFELSE([AC_LANG_PROGRAM( | ||
| 17 | -[[ | ||
| 18 | -#include <sys/types.h> | ||
| 19 | -#include <stdlib.h> | ||
| 20 | -#include <string.h> | ||
| 21 | -#include <stdio.h> | ||
| 22 | -#include <sys/socket.h> | ||
| 23 | -#include <sys/un.h> | ||
| 24 | -#include <errno.h> | ||
| 25 | -]], | ||
| 26 | -[[ | ||
| 27 | - int listen_fd, len; | ||
| 28 | - struct sockaddr_un addr; | ||
| 29 | - | ||
| 30 | - listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); | ||
| 31 | - if (listen_fd < 0) { | ||
| 32 | - perror ("socket() failed: "); | ||
| 33 | - exit (1); | ||
| 34 | - } | ||
| 35 | - memset (&addr, '\0', sizeof (addr)); | ||
| 36 | - addr.sun_family = AF_UNIX; | ||
| 37 | - strcpy (addr.sun_path, "X/tmp/gnet-fake-socket-path-used-in-configure-test"); | ||
| 38 | - len = SUN_LEN (&addr); /* calculate size before adding the \0 */ | ||
| 39 | - addr.sun_path[0] = '\0'; /* this is what makes it abstract */ | ||
| 40 | - | ||
| 41 | - if (bind (listen_fd, (struct sockaddr*) &addr, len) < 0) { | ||
| 42 | - perror ("Abstract socket namespace bind() failed: "); | ||
| 43 | - exit (1); | ||
| 44 | - } | ||
| 45 | - exit (0); | ||
| 46 | -]])], | ||
| 47 | - [ac_cv_gnet_have_abstract_sockets=yes], | ||
| 48 | - [ac_cv_gnet_have_abstract_sockets=no] | ||
| 49 | -)]) | ||
| 50 | -AC_LANG_POP(C) | ||
| 51 | - | ||
| 52 | -if test x$ac_cv_gnet_have_abstract_sockets = xyes ; then | ||
| 53 | - AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace]) | ||
| 54 | -fi | ||
| 55 | - | ||
| 56 | ############################### | ||
| 57 | # Compiler characteristics | ||
| 58 | AC_C_CONST | ||
diff --git a/meta/packages/gnet/gnet_svn.bb b/meta/packages/gnet/gnet_svn.bb new file mode 100644 index 0000000000..5ed604d690 --- /dev/null +++ b/meta/packages/gnet/gnet_svn.bb | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib." | ||
| 2 | LICENSE = "LGPL" | ||
| 3 | SECTION = "libs/network" | ||
| 4 | HOMEPAGE = "http://www.gnetlibrary.org" | ||
| 5 | DEPENDS = "glib-2.0" | ||
| 6 | PV = "2.0.7+svn${SRCDATE}" | ||
| 7 | |||
| 8 | SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk \ | ||
| 9 | file://buildfix.patch;patch=1 \ | ||
| 10 | file://configure_fix.patch;patch=1" | ||
| 11 | |||
| 12 | S = "${WORKDIR}/trunk" | ||
| 13 | |||
| 14 | EXTRA_OECONF = "--disable-pthreads" | ||
| 15 | |||
| 16 | FILES_${PN}-dev += "${libdir}/gnet-2.0" | ||
| 17 | |||
| 18 | inherit autotools pkgconfig | ||
| 19 | |||
| 20 | do_stage() { | ||
| 21 | autotools_stage_all | ||
| 22 | } | ||
