diff options
| -rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb (renamed from meta-oe/recipes-graphics/libyui/libyui_git.bb) | 4 |
2 files changed, 1 insertions, 35 deletions
diff --git a/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch b/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch deleted file mode 100644 index dbe241709a..0000000000 --- a/meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 5 Sep 2018 17:48:09 -0700 | ||
| 4 | Subject: [PATCH] Use curly braces for MAKE variable | ||
| 5 | |||
| 6 | Fixes errors with ninja | ||
| 7 | | ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$) | ||
| 8 | |||
| 9 | Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | buildtools/LibyuiCommon.cmake | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake | ||
| 16 | index cb93307..e6fbefd 100644 | ||
| 17 | --- a/buildtools/LibyuiCommon.cmake | ||
| 18 | +++ b/buildtools/LibyuiCommon.cmake | ||
| 19 | @@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE | ||
| 20 | ENABLE_TESTING() | ||
| 21 | # add a wrapper "tests" target, the builtin "test" cannot be extended :-( | ||
| 22 | ADD_CUSTOM_TARGET(tests | ||
| 23 | - $(MAKE) | ||
| 24 | - COMMAND $(MAKE) test | ||
| 25 | + ${MAKE} | ||
| 26 | + COMMAND ${MAKE} test | ||
| 27 | ) | ||
| 28 | ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE) | ||
| 29 | |||
| 30 | -- | ||
| 31 | 2.18.0 | ||
| 32 | |||
diff --git a/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb index d313fb02d7..d8a921925a 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb | |||
| @@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ | |||
| 7 | 7 | ||
| 8 | SRC_URI = "git://github.com/libyui/libyui.git \ | 8 | SRC_URI = "git://github.com/libyui/libyui.git \ |
| 9 | file://0001-Fix-build-with-clang.patch \ | 9 | file://0001-Fix-build-with-clang.patch \ |
| 10 | file://0001-Use-curly-braces-for-MAKE-variable.patch \ | ||
| 11 | file://0001-Use-relative-install-paths-for-CMake.patch \ | 10 | file://0001-Use-relative-install-paths-for-CMake.patch \ |
| 12 | " | 11 | " |
| 13 | 12 | ||
| 14 | PV = "3.3.3+git" | 13 | SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5" |
| 15 | SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c" | ||
| 16 | SRCREV_FORMAT = "default" | 14 | SRCREV_FORMAT = "default" |
| 17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
| 18 | 16 | ||
