홈 탐색 도움말
로그인
PUBLIC_REPOS
/
buildroot
의 미러 git://git.buildroot.net/buildroot
2
1
포크 0
파일
트리: c901bef2c8
브랜치 태그
buildroot
/
package
/
dbus-glib
/
dbus-glib-dbus-binding-tool.patch

dbus-glib-dbus-binding-tool.patch 8.0 KB
히스토리 Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140 
  1. [PATCH]: add --with-dbus-binding-tool option to use an external dbus-binding-tool
    2. 

  2. 

  3. Cross compilation fix. dbus-binding-tool needs to run on the host, but gets
    4. 

  4. compiled for the target. Add an option to use an external program
    5. 

  5. (host version) instead.
    6. 

  6. 

  7. Based on similar patch in ptxdist.
    8. 

  8. 

  9. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
    10. 

  10. ---
    11. 

  11.  configure.ac                           |    5 +++++
    12. 

  12.  dbus/examples/Makefile.am              |    4 ++--
    13. 

  13.  dbus/examples/statemachine/Makefile.am |    4 ++--
    14. 

  14.  test/core/Makefile.am                  |    6 +++---
    15. 

  15.  test/interfaces/Makefile.am            |   12 ++++++------
    16. 

  16.  tools/Makefile.am                      |    2 +-
    17. 

  17.  6 files changed, 19 insertions(+), 14 deletions(-)
    18. 

  18. 

  19. Index: dbus-glib-0.80/configure.ac
    20. 

  20. ===================================================================
    21. 

  21. --- dbus-glib-0.80.orig/configure.ac
    22. 

  22. +++ dbus-glib-0.80/configure.ac
    23. 

  23. @@ -70,6 +70,11 @@
    24. 

  24.      AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
    25. 

  25.  fi
    26. 

  26.  
    27. 

  27. +AC_ARG_WITH(dbus-binding-tool,
    28. 

  28. +  AS_HELP_STRING([--with-dbus-binding-tool=[filename]],[Use external dbus-binding-tool program]),
    29. 

  29. +  [DBUS_BINDING_TOOL=$withval],[DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool])
    30. 

  30. +AC_SUBST(DBUS_BINDING_TOOL)
    31. 

  31. +
    32. 

  32.  
    33. 

  33.  dnl DBUS_BUILD_TESTS controls unit tests built in to .c files 
    34. 

  34.  dnl and also some stuff in the test/ subdir
    35. 

  35. Index: dbus-glib-0.80/dbus/examples/Makefile.am
    36. 

  36. ===================================================================
    37. 

  37. --- dbus-glib-0.80.orig/dbus/examples/Makefile.am
    38. 

  38. +++ dbus-glib-0.80/dbus/examples/Makefile.am
    39. 

  39. @@ -21,7 +21,7 @@
    40. 

  40.  BUILT_SOURCES = example-service-glue.h
    41. 

  41.  
    42. 

  42.  example-service-glue.h: example-service.xml
    43. 

  43. -	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
    44. 

  44. +	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
    45. 

  45.  
    46. 

  46.  
    47. 

  47.  ## Makefile.am bits for another client/server pair
    48. 

  48. @@ -37,7 +37,7 @@
    49. 

  49.  BUILT_SOURCES += example-signal-emitter-glue.h
    50. 

  50.  
    51. 

  51.  example-signal-emitter-glue.h: example-signal-emitter.xml
    52. 

  52. -	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
    53. 

  53. +	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
    54. 

  54.  
    55. 

  55.  CLEANFILES = $(BUILT_SOURCES)
    56. 

  56.  
    57. 

  57. Index: dbus-glib-0.80/dbus/examples/statemachine/Makefile.am
    58. 

  58. ===================================================================
    59. 

  59. --- dbus-glib-0.80.orig/dbus/examples/statemachine/Makefile.am
    60. 

  60. +++ dbus-glib-0.80/dbus/examples/statemachine/Makefile.am
    61. 

  61. @@ -26,10 +26,10 @@
    62. 

  62.  BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h
    63. 

  63.  
    64. 

  64.  statemachine-server-glue.h: statemachine-server.xml
    65. 

  65. -	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
    66. 

  66. +	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $<
    67. 

  67.  
    68. 

  68.  statemachine-glue.h: statemachine.xml
    69. 

  69. -	$(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
    70. 

  70. +	$(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
    71. 

  71.  
    72. 

  72.  sm-marshal.c: Makefile sm-marshal.list
    73. 

  73.  	@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
    74. 

  74. Index: dbus-glib-0.80/test/core/Makefile.am
    75. 

  75. ===================================================================
    76. 

  76. --- dbus-glib-0.80.orig/test/core/Makefile.am
    77. 

  77. +++ dbus-glib-0.80/test/core/Makefile.am
    78. 

  78. @@ -63,13 +63,13 @@
    79. 

  79.  test_service_glib_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la $(DBUS_GLIB_THREADS_LIBS) 
    80. 

  80.  
    81. 

  81.  test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
    82. 

  82. -	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
    83. 

  83. +	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
    84. 

  84.  
    85. 

  85.  test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool
    86. 

  86. -	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
    87. 

  87. +	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
    88. 

  88.  
    89. 

  89.  test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
    90. 

  90. -	$(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
    91. 

  91. +	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
    92. 

  92.  
    93. 

  93.  my-object-marshal.c: Makefile my-object-marshal.list
    94. 

  94.  	@GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
    95. 

  95. Index: dbus-glib-0.80/test/interfaces/Makefile.am
    96. 

  96. ===================================================================
    97. 

  97. --- dbus-glib-0.80.orig/test/interfaces/Makefile.am
    98. 

  98. +++ dbus-glib-0.80/test/interfaces/Makefile.am
    99. 

  99. @@ -47,22 +47,22 @@
    100. 

  100.  	test-goodbye-bindings.h
    101. 

  101.  
    102. 

  102.  test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
    103. 

  103. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
    104. 

  104. +	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
    105. 

  105.  
    106. 

  106.  test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
    107. 

  107. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
    108. 

  108. +	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
    109. 

  109.  
    110. 

  110.  test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
    111. 

  111. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
    112. 

  112. +	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
    113. 

  113.  
    114. 

  114.  test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
    115. 

  115. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
    116. 

  116. +	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
    117. 

  117.  
    118. 

  118.  test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
    119. 

  119. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
    120. 

  120. +	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
    121. 

  121.  
    122. 

  122.  test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
    123. 

  123. -	$(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
    124. 

  124. +	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
    125. 

  125.  
    126. 

  126.  
    127. 

  127.  CLEANFILES = \
    128. 

  128. Index: dbus-glib-0.80/tools/Makefile.am
    129. 

  129. ===================================================================
    130. 

  130. --- dbus-glib-0.80.orig/tools/Makefile.am
    131. 

  131. +++ dbus-glib-0.80/tools/Makefile.am
    132. 

  132. @@ -4,7 +4,7 @@
    133. 

  133.  libdbus_glibdir = $(includedir)/dbus-1.0/dbus
    134. 

  134.  
    135. 

  135.  dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
    136. 

  136. -	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
    137. 

  137. +	$(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
    138. 

  138.  
    139. 

  139.  BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
    140. 

  140.  
    141.