On Sat, Mar 28, 2009 at 08:10:47PM +0800, Graham Percival wrote: > I'm contemplating a 2.13.1 release, but I'm still held up by > http://lists.gnu.org/archive/html/lilypond-devel/2008-12/msg00679.html > http://lists.gnu.org/archive/html/lilypond-devel/2008-06/msg00033.html > > For legal and time reasons, I can't act on this until June. Does > anybody else feel like patching this? Pretty please? ;)
Graham, try this patch to see if you have any luck. It doesn't cause any ill effects for me. You might want to do `rm -rf target/darwin-ppc target/darwin-x86' first though. -Patrick
>From 3e85875710380e7822bf85217156d7593616bca3 Mon Sep 17 00:00:00 2001 From: Patrick McCarty <[email protected]> Date: Sat, 28 Mar 2009 13:14:37 -0700 Subject: [PATCH] Fix odcctools compile * In `configure' for odcctools, the -Wno-long-double option should not be used. Signed-off-by: Patrick McCarty <[email protected]> --- gub/specs/darwin/odcctools.py | 3 +- patches/odcctools-config-Wno-long-double.patch | 55 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletions(-) create mode 100644 patches/odcctools-config-Wno-long-double.patch diff --git a/gub/specs/darwin/odcctools.py b/gub/specs/darwin/odcctools.py index 2039845..ee953c0 100644 --- a/gub/specs/darwin/odcctools.py +++ b/gub/specs/darwin/odcctools.py @@ -7,7 +7,8 @@ class Odcctools (cross.AutoBuild): #skews dependencies:, build.SdkBuild): source = ('svn:http://iphone-dev.googlecode.com/svn&module=trunk' '&branch=odcctools' '&revision=278') - patches = ['odcctools-r211-word.patch'] + patches = ['odcctools-r211-word.patch', + 'odcctools-config-Wno-long-double.patch'] def __init__ (self, settings, source): cross.AutoBuild.__init__ (self, settings, source) if 'x86_64-linux' in self.settings.build_architecture: diff --git a/patches/odcctools-config-Wno-long-double.patch b/patches/odcctools-config-Wno-long-double.patch new file mode 100644 index 0000000..42fe84f --- /dev/null +++ b/patches/odcctools-config-Wno-long-double.patch @@ -0,0 +1,55 @@ +From a1c653b18ae4d769b314b3317077aaba2cc13713 Mon Sep 17 00:00:00 2001 +From: Patrick McCarty <[email protected]> +Date: Sat, 28 Mar 2009 14:58:10 -0700 +Subject: [PATCH] Fix odcctools compile + +* Remove -Wno-long-double from odcctools configure + and configure.ac +--- + configure | 4 ++-- + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 66851df..2c4835f 100755 +--- a/configure ++++ b/configure +@@ -4460,7 +4460,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ORIGCFLAGS + + ORIGCFLAGS=$CFLAGS +-CFLAGS="$CFLAGS -Wno-long-double" ++CFLAGS=$CFLAGS + echo "$as_me:$LINENO: checking if -Wno-long-double is supported" >&5 + echo $ECHO_N "checking if -Wno-long-double is supported... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +@@ -4493,7 +4493,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- WARNINGS="$WARNINGS -Wno-long-double" ++ WARNINGS=$WARNINGS + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +diff --git a/configure.ac b/configure.ac +index 965cc97..08370cd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,11 +183,11 @@ AC_COMPILE_IFELSE( + CFLAGS=$ORIGCFLAGS + + ORIGCFLAGS=$CFLAGS +-CFLAGS="$CFLAGS -Wno-long-double" ++CFLAGS=$CFLAGS + AC_MSG_CHECKING([if -Wno-long-double is supported]) + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[const char hw[] = "Hello, World\n";]])], +- [WARNINGS="$WARNINGS -Wno-long-double" ++ [WARNINGS=$WARNINGS + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])] + ) +-- +1.6.2.1 + -- 1.6.2.1
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
