package/ninja: bump version to 1.10.2
PATCH 1/2 package/ninja: bump version to 1.10.2
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased package/ninja/0003-CMake-fix-object-library-usage.patch
[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
package/ninja/0001-set-minimum-cmake-version-to-3.10.patch +11 -9
@@ -1,4 +1,4 @@ -From 4645f74eb668cc1cf876d1e9bef933591da7575c Mon Sep 17 00:00:00 2001 +From 386fa849157dabde42ab39de7acb31750956490c Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> Date: Mon, 3 Feb 2020 06:21:57 -0800 Subject: [PATCH] set minimum cmake version to 3.10
@@ -10,21 +10,23 @@ Because we are not building ninja for Microsoft, it is safe to remove this macro and set the minimum version to 3.10. Signed-off-by: Adam Duskett <[email protected]> +[Rebased for ninja-1.10.2 - CMP0091 usage was removed upstream by +https://github.com/ninja-build/ninja/commit/e6f5bcffb3c561d228d88ff26edab26575b7d520] +Signed-off-by: Peter Seiderer <[email protected]> --- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 60fd8a1..a040e0b 100644 +index 7f03c35..4b61479 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,5 +1,4 @@ +@@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) --cmake_policy(SET CMP0091 NEW) +cmake_minimum_required(VERSION 3.10) - project(ninja) - if(CMAKE_BUILD_TYPE MATCHES "Release") + include(CheckIncludeFileCXX) + include(CheckIPOSupported) -- -2.24.1 +2.29.2
package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 87caa8c4bc536f745aceed757ce8a492fbdba84f Mon Sep 17 00:00:00 2001 -From: Adam Duskett <[email protected]> -Date: Mon, 3 Feb 2020 07:36:58 -0800 -Subject: [PATCH] remove fdiagnostics-color from make command - --fdiagnostics-color was introduced in gcc 4.9 and the minimum supported version -that Buildroot supports is 4.8. - -Signed-off-by: Adam Duskett <[email protected]> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a040e0b..af8010f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ if(MSVC) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /GR- /Zc:__cplusplus") - else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fdiagnostics-color") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") - endif() - - find_program(RE2C re2c) --- -2.24.1 -
package/ninja/0003-CMake-fix-object-library-usage.patch +35 -32
86 lines not on this page · raw message
package/ninja/ninja.hash +2 -2
@@ -1,3 +1,3 @@ # Locally generated -sha256 3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f ninja-1.10.0.tar.gz -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING +sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed ninja-1.10.2.tar.gz +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING
package/ninja/ninja.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -NINJA_VERSION = 1.10.0 +NINJA_VERSION = 1.10.2 NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING
Signature · 1 line
2.29.2
PATCH 2/2 package/meson: bump version to 0.56.0
--- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/meson/meson.hash +2 -2
@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.55.3/meson-0.55.3.tar.gz.asc -sha256 6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 meson-0.55.3.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.56.0/meson-0.56.0.tar.gz.asc +sha256 291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213 meson-0.56.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
package/meson/meson.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.55.3 +MESON_VERSION = 0.56.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING
Signature · 1 line
2.29.2
PATCH 1/2 package/ninja: bump version to 1.10.2
In reply to Peter SeidererQuoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>
Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/ninja: bump version to 1.10.2
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patch
Quoted 3 lines
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
No breakage detected (yet?), the only new feature is the following deprecation warning:
DEPRECATION: c_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: c_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION: cpp_link_args in the [properties] section of the machine file is deprecated, use the [built-in options] section.
Which can be fixed by the following patch:
package/meson/cross-compilation.conf.in +5 -3
@@ -14,13 +14,15 @@ g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' + +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] -sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' -pkg_config_static = '@STATIC@' [host_machine] system = 'linux'
Regards,
Peter
Quoted 2 lines
Thomas
PATCH 1/2 package/ninja: bump version to 1.10.2
Hi Peter, all,
Quoted 53 lines · Peter Seiderer
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patchQuoted 3 lines
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
No breakage detected (yet?), the only new feature is the following deprecation warning:
DEPRECATION:
c_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:c_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.Which can be fixed by the following patch:
package/meson/cross-compilation.conf.in +5
-0@@ -14,13 +14,15 @@ g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' + +[built-in options]
package/meson/cross-compilation.conf.in g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' · line 28
Quoted 10 lines
package/meson/cross-compilation.conf.in +0
-3c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] -sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' -pkg_config_static = '@STATIC@' [host_machine] system = 'linux'
Ninja build breaks on my development host because my host CMake is 3.10.2 and the following source file option like INCLUDE_DIRECTORIES was introduced in a later version:
set_source_files_properties(src/browse.cc
PROPERTIES
OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/build/browse_py.h"
INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}"
COMPILE_DEFINITIONS NINJA_PYTHON="python"
)The build breaks because build/browse_py.h cannot be found.
Though I can create a patch for it, I wonder whether it is time to bump the minimal CMake version to something new? To 3.16 for example?
Best regards,
Yegor
PATCH 1/2 package/ninja: bump version to 1.10.2
Hello Yegor,
Quoted 64 lines · Yegor Yefremov
Hi Peter, all,
Quoted 61 lines · Peter Seiderer
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patchQuoted 3 lines
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
No breakage detected (yet?), the only new feature is the following deprecation warning:
DEPRECATION:
c_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:c_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.Which can be fixed by the following patch:
package/meson/cross-compilation.conf.in +5
-3@@ -14,13 +14,15 @@ g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' + +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] -sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' -pkg_config_static = '@STATIC@'
Quoted 6 lines
package/meson/cross-compilation.conf.in g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' · line 28
Quoted 2 lines
package/meson/cross-compilation.conf.in +0
-0[host_machine] system = 'linux'Ninja build breaks on my development host because my host CMake is 3.10.2 and the following source file option like
INCLUDE_DIRECTORIESwas introduced in a later version:
Are you sure this is cmake version related? According to [1] INCLUDE_DIRECTORIES is valid for cmake-3.10.x..., what is the exact failure message?
Quoted 7 lines
set_source_files_properties(src/browse.cc
PROPERTIES
OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/build/browse_py.h"
INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}"
COMPILE_DEFINITIONS NINJA_PYTHON="python"
)The offending code was introduces with commit [2] 'CMake: Add support for "browse" mode'...
Quoted 2 lines
The build breaks because
build/browse_py.hcannot be found.
This file should be created by the cmake build system, see [3]..., so something seems to fail for this build step on your system (dependency?, missing tool?)...
Quoted 3 lines
Though I can create a patch for it, I wonder whether it is time to bump the minimal CMake version to something new? To 3.16 for example?
I believe unrelated to the failure...
Regards,
Peter
Quoted 3 lines
Best regards,
Yegor
[1] https://cmake.org/cmake/help/v3.10/prop_tgt/INCLUDE_DIRECTORIES.html
[2] https://github.com/ninja-build/ninja/commit/5b80abbc729e94abb5f5776a3438ad57d480c097
[3] https://github.com/ninja-build/ninja/blob/master/CMakeLists.txt#L151
PATCH 1/2 package/ninja: bump version to 1.10.2
Hello Yegor,
Quoted 98 lines · Peter Seiderer
Hello Yegor,
Quoted 64 lines · Yegor Yefremov
Hi Peter, all,
Quoted 61 lines · Peter Seiderer
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patchQuoted 3 lines
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
No breakage detected (yet?), the only new feature is the following deprecation warning:
DEPRECATION:
c_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:c_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.Which can be fixed by the following patch:
package/meson/cross-compilation.conf.in +5
-3@@ -14,13 +14,15 @@ g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' + +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] -sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' -pkg_config_static = '@STATIC@'Quoted 6 lines
package/meson/cross-compilation.conf.in g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' · line 28
Quoted 2 lines
package/meson/cross-compilation.conf.in +0
-0[host_machine] system = 'linux'Ninja build breaks on my development host because my host CMake is 3.10.2 and the following source file option like
INCLUDE_DIRECTORIESwas introduced in a later version:Are you sure this is cmake version related? According to [1]
INCLUDE_DIRECTORIESis valid for cmake-3.10.x..., what is the exact failure message?Quoted 7 lines
set_source_files_properties(src/browse.cc PROPERTIES OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/build/browse_py.h" INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}" COMPILE_DEFINITIONS NINJA_PYTHON="python" )The offending code was introduces with commit [2] 'CMake: Add support for "browse" mode'...
Quoted 2 lines
The build breaks because
build/browse_py.hcannot be found.This file should be created by the cmake build system, see [3]..., so something seems to fail for this build step on your system (dependency?, missing tool?)...
Quoted 1 line
Quoted 4 lines
Quoted 2 lines
Though I can create a patch for it, I wonder whether it is time to bump the minimal CMake version to something new? To 3.16 for example?
I believe unrelated to the failure...
Update: according to [4] INCLUDE_DIRECTORIES is mentioned for 'Properties on Source Files' (cmake-latest) but not for cmake-3.10.x [5]...
Maybe the failure can be avoided by changing from using INCLUDE_DIRECTORIES to COMPILE_FLAGS?
Regards,
Peter
[4] https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#source-file-properties
[5] https://cmake.org/cmake/help/v3.10/manual/cmake-properties.7.html#source-file-properties
Quoted 11 lines
Regards,
PeterQuoted 3 lines
Best regards,
Yegor[1] https://cmake.org/cmake/help/v3.10/prop_tgt/INCLUDE_DIRECTORIES.html
[2] https://github.com/ninja-build/ninja/commit/5b80abbc729e94abb5f5776a3438ad57d480c097
[3] https://github.com/ninja-build/ninja/blob/master/CMakeLists.txt#L151
PATCH 1/2 package/ninja: bump version to 1.10.2
Hello Yegor,
Quoted 105 lines · Peter Seiderer
Hello Yegor,
Quoted 101 lines · Peter Seiderer
Hello Yegor,
Quoted 64 lines · Yegor Yefremov
Hi Peter, all,
Quoted 61 lines · Peter Seiderer
Hello Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 10 lines · On Wed, 2 Dec 2020 20:42:35 +0100 Peter Seiderer <[email protected]> wrote:
- rebased 0001-set-minimum-cmake-version-to-3.10.patch
- removed 0002-remove-fdiagnostics-color-from-make-command.patch (superseeded by upstream commit [1])
- rebased
package/ninja/0003-CMake-fix-object-library-usage.patch[1] https://github.com/ninja-build/ninja/commit/418d59b8a6054ce9ef1a28c07c41d3a0bb386836
Signed-off-by Peter Seiderer <[email protected]>Quoted 8 lines
--- ...01-set-minimum-cmake-version-to-3.10.patch | 20 +++--- ...fdiagnostics-color-from-make-command.patch | 29 -------- .../0003-CMake-fix-object-library-usage.patch | 67 ++++++++++--------- package/ninja/ninja.hash | 4 +- package/ninja/ninja.mk | 2 +- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 package/ninja/0002-remove-fdiagnostics-color-from-make-command.patchQuoted 3 lines
Both applied. Could you keep an eye of meson-based package failures in the coming days? Updates of Meson have had a tendency to break stuff a bit in the past. Thanks!
No breakage detected (yet?), the only new feature is the following deprecation warning:
DEPRECATION:
c_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:c_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.
DEPRECATION:cpp_link_argsin the [properties] section of the machine file is deprecated, use the [built-in options] section.Which can be fixed by the following patch:
package/meson/cross-compilation.conf.in +5
-3@@ -14,13 +14,15 @@ g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' [properties] needs_exe_wrapper = true +sys_root = '@STAGING_DIR@' +pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' +pkg_config_static = '@STATIC@' + +[built-in options] c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] -sys_root = '@STAGING_DIR@' -pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' -pkg_config_static = '@STATIC@'Quoted 6 lines
package/meson/cross-compilation.conf.in g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' · line 28
Quoted 2 lines
package/meson/cross-compilation.conf.in +0
-0[host_machine] system = 'linux'Ninja build breaks on my development host because my host CMake is 3.10.2 and the following source file option like
INCLUDE_DIRECTORIESwas introduced in a later version:Are you sure this is cmake version related? According to [1]
INCLUDE_DIRECTORIESis valid for cmake-3.10.x..., what is the exact failure message?Quoted 7 lines
set_source_files_properties(src/browse.cc PROPERTIES OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/build/browse_py.h" INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}" COMPILE_DEFINITIONS NINJA_PYTHON="python" )The offending code was introduces with commit [2] 'CMake: Add support for "browse" mode'...
Quoted 2 lines
The build breaks because
build/browse_py.hcannot be found.This file should be created by the cmake build system, see [3]..., so something seems to fail for this build step on your system (dependency?, missing tool?)...
Quoted 3 lines
Though I can create a patch for it, I wonder whether it is time to bump the minimal CMake version to something new? To 3.16 for example?
Quoted 8 lines
Quoted 1 line
I believe unrelated to the failure...
Update: according to [4]
INCLUDE_DIRECTORIESis mentioned for 'Properties on Source Files' (cmake-latest) but not for cmake-3.10.x [5]...Maybe the failure can be avoided by changing from using
INCLUDE_DIRECTORIEStoCOMPILE_FLAGS?
Care to try rfc patch [6]?
Regards,
Peter
[6] https://patchwork.ozlabs.org/project/buildroot/patch/20201210193807.19225-1-ps.report at gmx.net/
Quoted 19 lines
Regards,
Peter[4] https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#source-file-properties
[5] https://cmake.org/cmake/help/v3.10/manual/cmake-properties.7.html#source-file-propertiesQuoted 11 lines
Regards,
PeterQuoted 3 lines
Best regards,
Yegor[1] https://cmake.org/cmake/help/v3.10/prop_tgt/INCLUDE_DIRECTORIES.html
[2] https://github.com/ninja-build/ninja/commit/5b80abbc729e94abb5f5776a3438ad57d480c097
[3] https://github.com/ninja-build/ninja/blob/master/CMakeLists.txt#L151