package/dbus-glib/dbus-glib-cross-compile.patch

   1 diff -ur dbus-glib-0.72/configure.ac dbus-glib-0.72-patched/configure.ac
   2 --- dbus-glib-0.72/configure.ac 2006-10-25 15:53:55.000000000 -0500
   3 +++ dbus-glib-0.72-patched/configure.ac 2006-11-15 14:15:09.000000000 -0600
   4 @@ -431,42 +431,6 @@
   5
   6  AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
   7
   8 -AC_CACHE_CHECK([for posix getpwnam_r],
   9 -               ac_cv_func_posix_getpwnam_r,
  10 -               [AC_TRY_RUN([
  11 -#include <errno.h>
  12 -#include <pwd.h>
  13 -int main () {
  14 -    char buffer[10000];
  15 -    struct passwd pwd, *pwptr = &pwd;
  16 -    int error;
  17 -    errno = 0;
  18 -    error = getpwnam_r ("", &pwd, buffer,
  19 -                        sizeof (buffer), &pwptr);
  20 -   return (error < 0 && errno == ENOSYS)
  21 -          || error == ENOSYS;
  22 -}               ],
  23 -       [ac_cv_func_posix_getpwnam_r=yes],
  24 -       [ac_cv_func_posix_getpwnam_r=no])])
  25 -if test "$ac_cv_func_posix_getpwnam_r" = yes; then
  26 -       AC_DEFINE(HAVE_POSIX_GETPWNAM_R,1,
  27 -               [Have POSIX function getpwnam_r])
  28 -else
  29 -       AC_CACHE_CHECK([for nonposix getpwnam_r],
  30 -               ac_cv_func_nonposix_getpwnam_r,
  31 -               [AC_TRY_LINK([#include <pwd.h>],
  32 -                       [char buffer[10000];
  33 -                               struct passwd pwd;
  34 -                               getpwnam_r ("", &pwd, buffer,
  35 -                                               sizeof (buffer));],
  36 -                       [ac_cv_func_nonposix_getpwnam_r=yes],
  37 -                       [ac_cv_func_nonposix_getpwnam_r=no])])
  38 -               if test "$ac_cv_func_nonposix_getpwnam_r" = yes; then
  39 -               AC_DEFINE(HAVE_NONPOSIX_GETPWNAM_R,1,
  40 -                       [Have non-POSIX function getpwnam_r])
  41 -       fi
  42 -fi
  43 -
  44  dnl check for socklen_t
  45  AC_MSG_CHECKING(whether socklen_t is defined)
  46  AC_TRY_COMPILE([
  47 @@ -532,49 +496,6 @@
  48
  49  #### Abstract sockets
  50
  51 -AC_MSG_CHECKING(abstract socket namespace)
  52 -AC_LANG_PUSH(C)
  53 -AC_RUN_IFELSE([AC_LANG_PROGRAM(
  54 -[[
  55 -#include <sys/types.h>
  56 -#include <stdlib.h>
  57 -#include <string.h>
  58 -#include <stdio.h>
  59 -#include <sys/socket.h>
  60 -#include <sys/un.h>
  61 -#include <errno.h>
  62 -]],
  63 -[[
  64 -  int listen_fd;
  65 -  struct sockaddr_un addr;
  66 -
  67 -  listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
  68 -
  69 -  if (listen_fd < 0)
  70 -    {
  71 -      fprintf (stderr, "socket() failed: %s\n", strerror (errno));
  72 -      exit (1);
  73 -    }
  74 -
  75 -  memset (&addr, '\0', sizeof (addr));
  76 -  addr.sun_family = AF_UNIX;
  77 -  strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test");
  78 -  addr.sun_path[0] = '\0'; /* this is what makes it abstract */
  79 -
  80 -  if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0)
  81 -    {
  82 -       fprintf (stderr, "Abstract socket namespace bind() failed: %s\n",
  83 -                strerror (errno));
  84 -       exit (1);
  85 -    }
  86 -  else
  87 -    exit (0);
  88 -]])],
  89 -              [have_abstract_sockets=yes],
  90 -              [have_abstract_sockets=no])
  91 -AC_LANG_POP(C)
  92 -AC_MSG_RESULT($have_abstract_sockets)
  93 -
  94  if test x$enable_abstract_sockets = xyes; then
  95      if test x$have_abstract_sockets = xno; then
  96         AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
  97 diff -ur dbus-glib-0.72/dbus/Makefile.in dbus-glib-0.72-patched/dbus/Makefile.in
  98 --- dbus-glib-0.72/dbus/Makefile.in     2006-10-25 16:14:31.000000000 -0500
  99 +++ dbus-glib-0.72-patched/dbus/Makefile.in     2006-11-15 14:15:09.000000000 -0600
 100 @@ -303,7 +303,7 @@
 101  target_cpu = @target_cpu@
 102  target_os = @target_os@
 103  target_vendor = @target_vendor@
 104 -SUBDIRS = . examples
 105 +SUBDIRS = .
 106  INCLUDES = \
 107         -I$(top_srcdir)                                         \
 108         -I$(top_builddir)                                       \
 109 @@ -371,7 +371,7 @@
 110         dbus-glib-tool.h                        \
 111         dbus-glib-tool.c
 112
 113 -dbus_binding_tool_LDADD = libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat
 114 +dbus_binding_tool_LDADD = libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(DBUS_BUS_LIBS)
 115  EXTRA_DIST = dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh
 116  @DBUS_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
 117
 118 diff -ur dbus-glib-0.72/Makefile.in dbus-glib-0.72-patched/Makefile.in
 119 --- dbus-glib-0.72/Makefile.in  2006-10-25 16:14:33.000000000 -0500
 120 +++ dbus-glib-0.72-patched/Makefile.in  2006-11-15 14:15:28.000000000 -0600
 121 @@ -277,7 +277,7 @@
 122  target_os = @target_os@
 123  target_vendor = @target_vendor@
 124  GLIB_PC = dbus-glib-1.pc
 125 -SUBDIRS = dbus tools test doc
 126 +SUBDIRS = dbus
 127  DIST_SUBDIRS = dbus tools test doc m4
 128  pkgconfigdir = $(libdir)/pkgconfig
 129  pkgconfig_DATA = $(GLIB_PC)