From be77d559872a87799071bb3e9cbb8b33a1859326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 5 Dec 2018 21:09:28 +0100
Subject: [PATCH] ardour5 / guitarix / nekobee: Fix build with oe-core waf
 change S != B
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* hack: just save working waf.bclass to wafold.bbclass
* this change is compatible to thud and master

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 classes/wafold.bbclass                        | 37 +++++++++++++++++++
 .../recipes-multimedia/ardour/ardour5_git.bb  |  2 +-
 .../guitarix/guitarix_0.37.3.bb               |  2 +-
 .../recipes-multimedia/nekobee/nekobee.bb     |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 classes/wafold.bbclass

diff --git a/classes/wafold.bbclass b/classes/wafold.bbclass
new file mode 100644
index 00000000..bd04b7a3
--- /dev/null
+++ b/classes/wafold.bbclass
@@ -0,0 +1,37 @@
+# avoids build breaks when using no-static-libs.inc
+DISABLE_STATIC = ""
+
+EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
+
+python waf_preconfigure() {
+    import subprocess
+    from distutils.version import StrictVersion
+    subsrcdir = d.getVar('S')
+    wafbin = os.path.join(subsrcdir, 'waf')
+    try:
+        result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
+        version = result.decode('utf-8').split()[1]
+        if StrictVersion(version) >= StrictVersion("1.8.7"):
+            d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
+    except subprocess.CalledProcessError as e:
+        bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
+    except FileNotFoundError:
+        bb.fatal("waf does not exist in %s" % subsrcdir)
+}
+
+do_configure[prefuncs] += "waf_preconfigure"
+
+wafold_do_configure() {
+	${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
+}
+
+do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
+wafold_do_compile()  {
+	${S}/waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
+}
+
+wafold_do_install() {
+	${S}/waf install --destdir=${D}
+}
+
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/recipes-misc/recipes-multimedia/ardour/ardour5_git.bb b/recipes-misc/recipes-multimedia/ardour/ardour5_git.bb
index 865a8f0d..2d1d6faf 100644
--- a/recipes-misc/recipes-multimedia/ardour/ardour5_git.bb
+++ b/recipes-misc/recipes-multimedia/ardour/ardour5_git.bb
@@ -28,7 +28,7 @@ DEPENDS += " \
     fluidsynth \
 "
 
-inherit waf distro_features_check gtk-icon-cache pkgconfig
+inherit wafold distro_features_check gtk-icon-cache pkgconfig
 
 REQUIRED_DISTRO_FEATURE = "x11"
 
diff --git a/recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb b/recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb
index 9f716d50..85a4b84c 100644
--- a/recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb
+++ b/recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb
@@ -10,7 +10,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "78ebc879e5cd7a6e4bd43ff8aec562e1"
 SRC_URI[sha256sum] = "4ca93bd4226cd175456f37612acd28b46e13133db61c0f235917dbcc3347d5f1"
 
-inherit waf fontcache gettext
+inherit wafold fontcache gettext
 
 DEPENDS += " \
     gperf-native \
diff --git a/recipes-misc/recipes-multimedia/nekobee/nekobee.bb b/recipes-misc/recipes-multimedia/nekobee/nekobee.bb
index dc61d05e..c9a9eca7 100644
--- a/recipes-misc/recipes-multimedia/nekobee/nekobee.bb
+++ b/recipes-misc/recipes-multimedia/nekobee/nekobee.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gordonjcp/nekobee"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-inherit waf pkgconfig
+inherit wafold pkgconfig
 
 DEPENDS += " \
     gtk+ \