0013-modules-common-Use-the-full-module-name-as-MODULE_NA.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. From 62463f4dc3cf5dcccbb406f832dedf518e82399b Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
  3. Date: Mon, 26 Mar 2018 16:44:44 +0200
  4. Subject: [PATCH 13/26] modules:common: Use the full module name as MODULE_NAME
  5. This avoid conflicts when linking modules staticly on platforms that don't
  6. have objdump
  7. ---
  8. modules/common.am | 4 ++--
  9. 1 file changed, 2 insertions(+), 2 deletions(-)
  10. diff --git a/modules/common.am b/modules/common.am
  11. index 1b9117c98d..fc67a39bca 100644
  12. --- a/modules/common.am
  13. +++ b/modules/common.am
  14. @@ -16,12 +16,12 @@ LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
  15. # Module name from object or executable file name.
  16. MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p=$$(echo "$$p"|sed 's/-/_/g'); p="$${p%.lo}"; echo "$$p")
  17. -
  18. +MODULE_FULLNAME = $$(p="$@"; p="$${p\#lib}"; p="$${p%_plugin*}"; p=$$(echo "$$p"|sed 's/[-\/]/_/g'); p="$${p%.lo}"; echo "$$p")
  19. AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_NAME)\"
  20. if HAVE_DYNAMIC_PLUGINS
  21. AM_CPPFLAGS += -D__PLUGIN__
  22. else
  23. -AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
  24. +AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_FULLNAME)
  25. endif
  26. AM_CFLAGS =
  27. AM_CXXFLAGS =
  28. --
  29. 2.20.1