0002-fix-non-cplusplus-build.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. Handle builds without C++
  2. libxmlrpc nicely handles the fact of being built without C++ support,
  3. except for two locations, fixed by this patch.
  4. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  5. Signed-off-by: Alvaro Gamez Machado <alvaro.gamez@hazent.com>
  6. Index: b/lib/util/Makefile
  7. ===================================================================
  8. --- a/lib/util/Makefile
  9. +++ b/lib/util/Makefile
  10. @@ -41,11 +41,14 @@
  11. LIBOBJS = \
  12. casprintf.o \
  13. cmdline_parser.o \
  14. - cmdline_parser_cpp.o \
  15. getoptx.o \
  16. string_parser.o \
  17. stripcaseeq.o \
  18. +ifeq ($(ENABLE_CPLUSPLUS),yes)
  19. +LIBOBJS += cmdline_parser_cpp.o
  20. +endif
  21. +
  22. .PHONY: all
  23. all: $(LIBOBJS)
  24. Index: b/lib/Makefile
  25. ===================================================================
  26. --- a/lib/Makefile
  27. +++ b/lib/Makefile
  28. @@ -9,7 +9,10 @@
  29. # Build up SUBDIRS:
  30. SUBDIRS =
  31. -SUBDIRS += util libutil libutil++
  32. +SUBDIRS += util libutil
  33. +ifeq ($(ENABLE_CPLUSPLUS),yes)
  34. + SUBDIRS += libutil++
  35. +endif
  36. ifeq ($(ENABLE_ABYSS_SERVER),yes)
  37. SUBDIRS += abyss
  38. ifeq ($(ENABLE_CPLUSPLUS),yes)