diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch')
-rw-r--r-- | yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch new file mode 100644 index 000000000..2bb5bb11c --- /dev/null +++ b/yocto-poky/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch @@ -0,0 +1,26 @@ +Do not include /usr/include host paths + +These were added upstream apparently for freebsd support, but trigger +compiler warnings during the build and could be dangerous, so remove +them. + +Upstream-Status: Inappropriate [cross] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Update patch for version 0.7.4. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800 ++++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800 +@@ -1,9 +1,5 @@ + cmake_minimum_required(VERSION 2.6.0) + +-#freebsd support +-include_directories(SYSTEM /usr/local/include) +-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) +- + #extract version from qmmp.h + FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" + QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") |