0007-modules-common-Use-the-full-module-name-as-MODULE_NA.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233
  1. From 0af3f8871ef00eea6f402fc6588bb225b9c8ffbc 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 07/17] modules:common: Use the full module name as MODULE_NAME
  5. This avoid conflicts when linking modules staticly on platforms that don't have objdump
  6. ---
  7. modules/common.am | 3 ++-
  8. 1 file changed, 2 insertions(+), 1 deletion(-)
  9. diff --git a/modules/common.am b/modules/common.am
  10. index b991f6ce2f..d327b23871 100644
  11. --- a/modules/common.am
  12. +++ b/modules/common.am
  13. @@ -17,12 +17,13 @@ LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la
  14. # Module name from object or executable file name.
  15. MODULE_STRING = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; p="$${p%_plugin*}"; p=$$(echo "$$p"|sed 's/-/_/g'); p="$${p%.lo}"; echo "$$p")
  16. MODULE_NAME = $$(p="$@"; p=$$(echo "$$p"|sed 's/lib//g'); p="$${p%_plugin*}"; p=$$(echo "$$p"|sed 's/[-\/]/_/g'); p="$${p%.lo}"; echo "$$p")
  17. +MODULE_FULLNAME = $$(p="$@"; p="$${p\#lib}"; p="$${p%_plugin*}"; p=$$(echo "$$p"|sed 's/[-\/]/_/g'); p="$${p%.lo}"; echo "$$p")
  18. AM_CPPFLAGS = -DMODULE_STRING=\"$(MODULE_STRING)\"
  19. if HAVE_DYNAMIC_PLUGINS
  20. AM_CPPFLAGS += -D__PLUGIN__
  21. else
  22. -AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_NAME)
  23. +AM_CPPFLAGS += -DMODULE_NAME=$(MODULE_FULLNAME)
  24. endif
  25. AM_CFLAGS =
  26. AM_CXXFLAGS =
  27. --
  28. 2.21.1 (Apple Git-122.3)