2
1

dbus-glib-cross-compile.patch 4.2 KB

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