From 6e5a3f0b0d4cb722eefcfd5777022cabab54dda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 26 Jan 2020 22:06:43 +0100 Subject: [PATCH] ardour5: Follow suggestion from PR and simplify out-of-tree-patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...0006-Find-fmt-binding-in-out-of-tree-building.patch | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/recipes-musicians/ardour/ardour5/0006-Find-fmt-binding-in-out-of-tree-building.patch b/recipes-musicians/ardour/ardour5/0006-Find-fmt-binding-in-out-of-tree-building.patch index 4f24c1d..aaca48b 100644 --- a/recipes-musicians/ardour/ardour5/0006-Find-fmt-binding-in-out-of-tree-building.patch +++ b/recipes-musicians/ardour/ardour5/0006-Find-fmt-binding-in-out-of-tree-building.patch @@ -19,20 +19,12 @@ diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index beb5b196b8..ed1d5631dd 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript -@@ -1,6 +1,6 @@ - #!/usr/bin/env python - from waflib.extras import autowaf as autowaf --from waflib import Options, TaskGen -+from waflib import Options, TaskGen, Context - import waflib.Logs as Logs, waflib.Utils as Utils - import os - import shutil @@ -852,7 +852,7 @@ def build(bld): # NATIVE ARDOUR BINDING FILES # explicitly state the use of perl here so that it works on windows too # - a_rule = 'perl ../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC[0].abspath()} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] ) -+ a_rule = 'perl %s/tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC[0].abspath()} >${TGT}' % (Context.top_dir, sys.platform, bld.env['WINDOWS_KEY'] ) ++ a_rule = 'perl %s/tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC[0].abspath()} >${TGT}' % (bld.top_dir, sys.platform, bld.env['WINDOWS_KEY'] ) for b in [ 'ardour' ] : obj = bld( target = b + '.keys',