From dfc05472bb2ff59f475ff46147bb2ded37db88ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 10 Aug 2018 21:31:15 +0200
Subject: [PATCH] drumstick: fix lib path for 64bit/multilib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../drumstick/drumstick_1.1.1.bb              |  3 ++
 ...not-set-lib-suffix-oe-will-take-care.patch | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch

diff --git a/recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb b/recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb
index ce788cf2..aefb38b9 100644
--- a/recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb
+++ b/recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb
@@ -12,10 +12,13 @@ DEPENDS += " \
 "
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/project/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
+    file://0001-Do-not-set-lib-suffix-oe-will-take-care.patch \
 "
 SRC_URI[md5sum] = "a1fd83216f65619fea766dfc0a6f5266"
 SRC_URI[sha256sum] = "367743764c8f5c6e40bb19b9581f083da2881b9c9516d6b3b247e5644dee7c2b"
 
+EXTRA_OECMAKE = "-DLIB_SUFFIX=`echo ${baselib} | sed -e s/lib//`"
+
 FILES_${PN} += " \
     ${datadir}/mime \
     ${datadir}/icons \
diff --git a/recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch b/recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch
new file mode 100644
index 00000000..ed5ea18e
--- /dev/null
+++ b/recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch
@@ -0,0 +1,35 @@
+From 30166fe55c9a7c65f5db04e75e92407da4f0e88a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 10 Aug 2018 14:00:52 +0200
+Subject: [PATCH] Do not set lib-suffix - oe will take care
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 274b6fa..6782e43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,11 +21,7 @@ endif()
+ 
+ project(DRUMSTICK)
+ 
+-if(CMAKE_SIZEOF_VOID_P MATCHES "8")
+-    set(_INIT_LIB_SUFFIX "64")
+-else()
+-    set(_INIT_LIB_SUFFIX "")
+-endif()
++set(_INIT_LIB_SUFFIX "")
+ set(LIB_SUFFIX ${_INIT_LIB_SUFFIX} CACHE STRING "optional library install directory suffix: 32, 64, none")
+ 
+ set(CMAKE_COLOR_MAKEFILE ON)
+-- 
+2.14.4
+