diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-09-25 23:04:35 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-25 14:45:20 -0700 |
commit | b544304c7cb50d55b28f0083ccfc23cc9fec8bc6 (patch) | |
tree | f2b47c28d57c2ce88ca73d63de9bbf752625e66f | |
parent | 9c6302ba08d04ac4b9bf51a1cca4c343b0e3a67a (diff) | |
download | meta-openembedded-contrib-b544304c7cb50d55b28f0083ccfc23cc9fec8bc6.tar.gz |
libyui: update to 3.6.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-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 @@ -From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 Sep 2018 17:48:09 -0700 -Subject: [PATCH] Use curly braces for MAKE variable - -Fixes errors with ninja -| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$) - -Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - buildtools/LibyuiCommon.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake -index cb93307..e6fbefd 100644 ---- a/buildtools/LibyuiCommon.cmake -+++ b/buildtools/LibyuiCommon.cmake -@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS ) # setup compiler-flags depending on CMAKE_BUILD_TYPE - ENABLE_TESTING() - # add a wrapper "tests" target, the builtin "test" cannot be extended :-( - ADD_CUSTOM_TARGET(tests -- $(MAKE) -- COMMAND $(MAKE) test -+ ${MAKE} -+ COMMAND ${MAKE} test - ) - ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE) - --- -2.18.0 - 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 \ SRC_URI = "git://github.com/libyui/libyui.git \ file://0001-Fix-build-with-clang.patch \ - file://0001-Use-curly-braces-for-MAKE-variable.patch \ file://0001-Use-relative-install-paths-for-CMake.patch \ " -PV = "3.3.3+git" -SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c" +SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5" SRCREV_FORMAT = "default" S = "${WORKDIR}/git" |