Bug#592484: lilypond: FTBFS with current gcc/eglibc

[Petr Salinger]

Package: lilypond
Version: 2.12.3-6
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd


Hi,

the current version fails to build under current sid.

Please find attached patch with needed tweaks.

Thanks in advance

                        Petr

diff -u lilypond-2.12.2/debian/rules lilypond-2.12.2/debian/rules
--- lilypond-2.12.2/debian/rules
+++ lilypond-2.12.2/debian/rules
@@ -82,7 +82,7 @@
 	[ ! -f Makefile ] || $(MAKE) web-clean
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f lib/python
-	rm -f ./stepmake/bin/config.guess ./stepmake/bin/config.guess.sub
+	rm -f ./stepmake/bin/config.guess ./stepmake/bin/config.sub
 
 	# Still not clean enough?  Let's use... BRUTE STRENGTH!  :-)
 	find . -type d -name 'out' -o -name 'out-www' | xargs rm -rf
diff -u lilypond-2.12.2/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc
--- lilypond-2.12.2/lily/relocate.cc
+++ lilypond-2.12.2/lily/relocate.cc
@@ -278,13 +278,13 @@
   string out;
   while (ptr < start_ptr + len)
     {
-      char *dollar = strchr (ptr, '$');
+      const char *dollar = strchr (ptr, '$');
       
       if (dollar != NULL)
 	{
-	  char *start_var = dollar + 1;
-	  char *end_var = start_var;
-	  char *start_next = end_var;
+	  const char *start_var = dollar + 1;
+	  const char *end_var = start_var;
+	  const char *start_next = end_var;
 	  
 	  out += string (ptr, dollar - ptr);
 	  ptr = dollar;