mixxx: fix build on build machines where qttools or protobuff are not installed
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
From 5c81f8bf6b60dbc289ec0ad7657362bec169a35b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 7 Dec 2016 18:33:04 +0100
|
||||
Subject: [PATCH] align path of qt build tools to our needs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
build/qt5.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/qt5.py b/build/qt5.py
|
||||
index aa70a42..da96996 100644
|
||||
--- a/build/qt5.py
|
||||
+++ b/build/qt5.py
|
||||
@@ -704,7 +704,7 @@ def generate(env):
|
||||
def locateQt5Command(env, command, qtdir) :
|
||||
triedPaths = []
|
||||
for suffix in suffixes :
|
||||
- fullpath = os.path.join(qtdir,'bin',command + suffix)
|
||||
+ fullpath = os.path.join(qtdir,command + suffix)
|
||||
if os.access(fullpath, os.X_OK) :
|
||||
return fullpath
|
||||
triedPaths.append(fullpath)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -3,13 +3,14 @@ HOMEPAGE = "http://mixxx.org/"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=bb18019490a2ef1942831060527e3feb"
|
||||
|
||||
inherit scons
|
||||
inherit scons qmake5_paths
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtscript \
|
||||
qtsvg \
|
||||
qtxmlpatterns \
|
||||
qttools-native \
|
||||
libusb1 \
|
||||
hidapi \
|
||||
upower \
|
||||
@@ -21,7 +22,7 @@ DEPENDS += " \
|
||||
libmp4v2 \
|
||||
libogg \
|
||||
libvorbis \
|
||||
protobuf \
|
||||
protobuf protobuf-native \
|
||||
fftw \
|
||||
portaudio-v19 \
|
||||
portmidi \
|
||||
@@ -36,6 +37,7 @@ SRC_URI = " \
|
||||
git://github.com/mixxxdj/${BPN}.git \
|
||||
file://0001-do-not-check-for-known-machine-types.patch \
|
||||
file://0002-force-using-system-soundtouch.patch \
|
||||
file://0003-align-path-of-qt-build-tools-to-our-needs.patch \
|
||||
"
|
||||
SRCREV = "14e10b29b57ae46ff8bb9ac0b815f8a4cb475848"
|
||||
S = "${WORKDIR}/git"
|
||||
@@ -50,6 +52,7 @@ EXTRA_OESCONS += " \
|
||||
target=linux \
|
||||
machine=${TARGET_ARCH} \
|
||||
qt5=1 \
|
||||
qtdir=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
|
||||
shoutcast=0 \
|
||||
localecompare=0 \
|
||||
faad=1 \
|
||||
@@ -57,7 +60,6 @@ EXTRA_OESCONS += " \
|
||||
"
|
||||
# perftools=1
|
||||
|
||||
|
||||
do_install_prepend() {
|
||||
install -d ${D}${prefix}
|
||||
sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript
|
||||
|
||||
Reference in New Issue
Block a user