summarylogtreecommitdiffstats
path: root/fix_buildsystem.patch
diff options
context:
space:
mode:
Diffstat (limited to 'fix_buildsystem.patch')
-rw-r--r--fix_buildsystem.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/fix_buildsystem.patch b/fix_buildsystem.patch
new file mode 100644
index 000000000000..ee164e5e61a3
--- /dev/null
+++ b/fix_buildsystem.patch
@@ -0,0 +1,23 @@
+diff --git a/lily/GNUmakefile b/lily/GNUmakefile
+index c688b836e5..6ce235f257 100644
+--- a/lily/GNUmakefile
++++ b/lily/GNUmakefile
+@@ -103,15 +103,15 @@ $(outdir)/general-scheme.o: $(outdir)/version.hh
+ $(outdir)/lily-version.o: $(outdir)/version.hh
+ $(outdir)/relocate.o: $(outdir)/version.hh
+
+-prefix :={c++}/[ \t]*
++pre :={c++}/[ \t]*
+ second :=[ \t\n\v]*([^,]*,[^""]*\"\([^""]*\)/\1/m
+ third :=[ \t\n\v]*([^,]*,[^,]*,[^""]*\"\([^""]*\)/\1/m
+ three-arg-calls := MAKE_SCHEME_CALLBACK_WITH_OPTARGS MAKE_DOCUMENTED_SCHEME_CALLBACK MAKE_SCHEME_CALLBACK
+ two-arg-calls := LY_DEFINE LY_DEFINE_WITH_SETTER
+
+ regex_ =
+-regex_ += $(foreach fname,$(two-arg-calls),--regex='$(prefix)$(fname)$(second)')
+-regex_ += $(foreach fname,$(three-arg-calls),--regex='$(prefix)$(fname)$(third)')
++regex_ += $(foreach fname,$(two-arg-calls),--regex='$(pre)$(fname)$(second)')
++regex_ += $(foreach fname,$(three-arg-calls),--regex='$(pre)$(fname)$(third)')
+
+ ETAGS_FLAGS += $(regex_)
+ CTAGS_FLAGS += $(regex_)