From 0eb96abfc974f3a07b2e3c7de69aca6ffc9d584d Mon Sep 17 00:00:00 2001 From: Qing He Date: Thu, 12 Aug 2010 13:55:07 +0800 Subject: gamin: put into meta-lsb changes: - gamin now also PROVIDES fam, moved to meta-lsb - separate out libgamin Signed-off-by: Qing He --- .../packages/gamin/gamin/no-abstract-sockets.patch | 54 ++++++++++++++++++++++ meta-lsb/packages/gamin/gamin_0.1.10.bb | 29 ++++++++++++ .../packages/gamin/gamin/no-abstract-sockets.patch | 54 ---------------------- meta-moblin/packages/gamin/gamin_0.1.10.bb | 9 ---- 4 files changed, 83 insertions(+), 63 deletions(-) create mode 100644 meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch create mode 100644 meta-lsb/packages/gamin/gamin_0.1.10.bb delete mode 100644 meta-moblin/packages/gamin/gamin/no-abstract-sockets.patch delete mode 100644 meta-moblin/packages/gamin/gamin_0.1.10.bb diff --git a/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch b/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch new file mode 100644 index 000000000..b8aacfb23 --- /dev/null +++ b/meta-lsb/packages/gamin/gamin/no-abstract-sockets.patch @@ -0,0 +1,54 @@ +--- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 ++++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 +@@ -354,51 +354,6 @@ + AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) + fi + +-#### Abstract sockets +- +-AC_MSG_CHECKING(abstract socket namespace) +-AC_LANG_PUSH(C) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_LANG_POP(C) +-AC_MSG_RESULT($have_abstract_sockets) +- + if test x$enable_abstract_sockets = xyes; then + if test x$have_abstract_sockets = xno; then + AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) diff --git a/meta-lsb/packages/gamin/gamin_0.1.10.bb b/meta-lsb/packages/gamin/gamin_0.1.10.bb new file mode 100644 index 000000000..e540c290a --- /dev/null +++ b/meta-lsb/packages/gamin/gamin_0.1.10.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Gamin is a file and directory monitoring system defined to \ +be a subset of the FAM (File Alteration Monitor) system." +HOMEPAGE = "http://people.gnome.org/~veillard/gamin/" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=412a9be54757a155d0b997b52b519f62" + +PROVIDES = "fam" +PR = "r1" + +SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ + file://no-abstract-sockets.patch" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-python" + +PACKAGES += "lib${PN} lib${PN}-dev lib${PN}-dbg" +FILES_${PN} = "${libexecdir}" +FILES_${PN}-dbg = "${libexecdir}/.debug" +FILES_lib${PN} = "${libdir}/lib*.so.*" +FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ + ${libdir}/lib*.a ${libdir}/lib*.so" +FILES_lib${PN}-dbg = "${libdir}/.debug/" + +RDEPENDS_lib${PN} = "${PN}" + +LEAD_SONAME = "libgamin-1.so" + diff --git a/meta-moblin/packages/gamin/gamin/no-abstract-sockets.patch b/meta-moblin/packages/gamin/gamin/no-abstract-sockets.patch deleted file mode 100644 index b8aacfb23..000000000 --- a/meta-moblin/packages/gamin/gamin/no-abstract-sockets.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 -+++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 -@@ -354,51 +354,6 @@ - AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) - fi - --#### Abstract sockets -- --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include --#include --#include --#include --#include --#include --#include --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) --AC_MSG_RESULT($have_abstract_sockets) -- - if test x$enable_abstract_sockets = xyes; then - if test x$have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) diff --git a/meta-moblin/packages/gamin/gamin_0.1.10.bb b/meta-moblin/packages/gamin/gamin_0.1.10.bb deleted file mode 100644 index 48fc73e6d..000000000 --- a/meta-moblin/packages/gamin/gamin_0.1.10.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Gamin is a file and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor) system." -LICENSE = "LGPL" - -SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ - file://no-abstract-sockets.patch;patch=1" - -EXTRA_OECONF = " --without-python " - -inherit autotools pkgconfig -- cgit v1.2.3