head 1.5; access; symbols pkgsrc-2026Q2:1.4.0.4 pkgsrc-2026Q2-base:1.4 pkgsrc-2026Q1:1.4.0.2 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.3.0.6 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.4 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.2 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.2.0.4 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.2 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.1.0.4 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.2 pkgsrc-2024Q2-base:1.1; locks; strict; comment @# @; 1.5 date 2026.09.03.10.15.34; author adam; state Exp; branches; next 1.4; commitid QV5eWFVjxwZ34aUG; 1.4 date 2025.12.27.22.17.02; author adam; state Exp; branches; next 1.3; commitid fDTXgN0cOWHM56oG; 1.3 date 2025.04.02.15.12.07; author adam; state Exp; branches; next 1.2; commitid Uf9iCQq1Yw45ouPF; 1.2 date 2024.11.24.07.21.16; author adam; state Exp; branches; next 1.1; commitid KgbR6oj2YnxEVRyF; 1.1 date 2024.05.12.17.45.15; author wiz; state Exp; branches; next ; commitid oU31U1RPFoYpGJ9F; desc @@ 1.5 log @py-ninja: updated to 1.13.2 1.13.2 chore: adopt PEP-639 license metadata format chore: pytest log_level is better than log_cli_level ci: build with clang instead of gcc ci: secure GitHub Actions workflows chore(ci): use manylinux clang install script Added note about ninja_syntax names being in the ninja namespace. fix: force BUILD_TESTING to inherit RUN_NINJA_TEST value Update to Ninja 1.13.2.g7659b.kitware.jobserver-pipe-1 @ text @$NetBSD: patch-CMakeLists.txt,v 1.4 2025/12/27 22:17:02 adam Exp $ Don't build ninja binary. Just install a link to the pkgsrc copy in the package Makefile instead. --- CMakeLists.txt.orig 2022-11-09 12:37:21.000000000 +0000 +++ CMakeLists.txt @@@@ -26,7 +26,6 @@@@ message(STATUS "************************ set(BUILD_TESTING "${RUN_NINJA_TEST}" CACHE BOOL "Build the testing tree." FORCE) set_property(CACHE BUILD_TESTING PROPERTY TYPE INTERNAL) -add_subdirectory(ninja-upstream) if(RUN_NINJA_TEST) add_custom_target( @@@@ -36,5 +35,5 @@@@ if(RUN_NINJA_TEST) ) endif() -install(TARGETS ninja COMPONENT python DESTINATION "${SKBUILD_SCRIPTS_DIR}") +set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/ninja-upstream") install(FILES "${ninja_SOURCE_DIR}/misc/ninja_syntax.py" COMPONENT python DESTINATION ninja) @ 1.4 log @py-ninja: updated to 1.13.0 1.13.0 break: drop Python 3.7, manylinux2010 & musllinux_1_1 feat: use 1.13.0 official release feat: use 1.13.0 from Kitware fork (older Make observers support) feat: add riscv64 linux wheels feat: use a manylinux_2_31 compatible image for riscv64 fix: fail early if Ninja sources are missing chore(deps): bump pypa/cibuildwheel from 2.23 to 3.1 chore: Simplify build-system replacing FetchContent calls with add_subdirectory ci: split QEMU builds @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.3 2025/04/02 15:12:07 adam Exp $ d8 3 a10 3 @@@@ -23,7 +23,6 @@@@ message(STATUS "") message(STATUS " RUN_NINJA_TEST : ${RUN_NINJA_TEST}") message(STATUS "************************************") d16 1 a16 1 @@@@ -33,5 +32,5 @@@@ if(RUN_NINJA_TEST) @ 1.3 log @py-ninja: updated to 1.11.1.4 1.11.1.4 ci(linux): use GHA ARM runners to build ARM wheels fix: linter issues & nox macOS build feat: use a submodule for ninja sources chore: use dependency-groups @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.2 2024/11/24 07:21:16 adam Exp $ d3 2 a4 3 Avoid downloading and building ninja. We'll just install a link to the pkgsrc copy in the package Makefile instead. d6 1 a6 1 --- CMakeLists.txt.orig 2025-04-02 15:03:02.617445005 +0000 d8 1 a8 1 @@@@ -13,12 +13,6 @@@@ message(STATUS "") d12 1 a12 6 -include(FetchContent) -FetchContent_Declare( - ninja - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ninja-upstream -) -FetchContent_MakeAvailable(ninja) d16 1 a16 1 @@@@ -28,5 +22,5 @@@@ if(RUN_NINJA_TEST) d21 1 a21 1 +set(ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src") @ 1.2 log @py-ninja: updated to 1.11.1.2 1.11.1.2 chore: remove versioneer related code from setup.py fix: artifact upload/download ci: group dependabot updates chore(ci): bump test_sdist python from 3.11 to 3.12 feat: use scikit-build-core feat: Python 3.7+ ci: bump to macos-13 fix(ci): test sdist on ubuntu-22.04 feat: add armv7l wheels chore(deps): bump pypa/cibuildwheel to 2.22.0 in the actions group chore: run pip check as part of tests @ text @d1 1 a1 1 $NetBSD: patch-CMakeLists.txt,v 1.1 2024/05/12 17:45:15 wiz Exp $ d7 1 a7 1 --- CMakeLists.txt.orig 2022-11-09 12:37:21.000000000 +0000 d9 3 a11 11 @@@@ -24,7 +24,6 @@@@ set(src_archive "unix_source") if(WIN32) set(src_archive "windows_source") endif() -check_archive_var("${src_archive}") message(STATUS "*********************************************") message(STATUS "Ninja Python Distribution") @@@@ -46,15 +45,5 @@@@ if(NOT BUILD_VERBOSE) ) endif() d16 1 a16 4 - URL ${${src_archive}_url} - URL_HASH SHA256=${${src_archive}_sha256} - DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR} - ${ep_download_no_progress_args} d19 7 a25 1 - @ 1.1 log @devel/py-ninja: import py-ninja-1.11.1.1 Ninja is a small build system with a focus on speed. The latest Ninja python wheels provide a ninja executable and ninja_syntax.py for generating .ninja files. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 --- CMakeLists.txt.orig 2023-10-09 17:05:36.000000000 +0000 d9 1 a9 1 @@@@ -27,7 +27,7 @@@@ set(src_archive "unix_source") a13 1 +#check_archive_var("${src_archive}") d15 4 a18 23 #----------------------------------------------------------------------------- # Summary @@@@ -60,21 +60,6 @@@@ endif() #----------------------------------------------------------------------------- if(NOT DEFINED Ninja_SOURCE_DIR) set(Ninja_SOURCE_DIR "${CMAKE_SOURCE_DIR}/Ninja-src") - - # Download selected source archive - ExternalProject_add(download_ninja_source - SOURCE_DIR ${Ninja_SOURCE_DIR} - URL ${${src_archive}_url} - URL_HASH SHA256=${${src_archive}_sha256} - DOWNLOAD_DIR ${ARCHIVE_DOWNLOAD_DIR} - USES_TERMINAL_DOWNLOAD 1 - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - BUILD_IN_SOURCE 1 - INSTALL_COMMAND "" - ${ep_download_no_progress_args} - ) - message(STATUS "download_ninja_source - URL: ${${src_archive}_url}") elseif(NOT EXISTS ${Ninja_SOURCE_DIR}) message(FATAL_ERROR "Ninja_SOURCE_DIR is set to a nonexistent directory") a19 3 @@@@ -102,48 +87,5 @@@@ foreach(var_name IN ITEMS endif() endforeach() d21 9 a29 42 -# _cache_args should not be empty -list(APPEND _cache_args -DNINJA_SUPERBUILD:BOOL=true) -ExternalProject_add(build_ninja - SOURCE_DIR ${Ninja_SOURCE_DIR} - BINARY_DIR ${Ninja_BINARY_DIR} - DOWNLOAD_COMMAND "" - UPDATE_COMMAND "" - BUILD_ALWAYS 1 - USES_TERMINAL_CONFIGURE 1 - USES_TERMINAL_BUILD 1 - INSTALL_COMMAND "" - CMAKE_CACHE_ARGS ${_cache_args} - DEPENDS - download_ninja_source - ) -set(ninja_executable ${Ninja_BINARY_DIR}/ninja${CMAKE_EXECUTABLE_SUFFIX}) -set(NINJA_BUILD_LAST_STEP "build") - -# This should not be stripped or tested if cross-compiling on Windows -if(CMAKE_CROSS_COMPILE OR NOT DEFINED ENV{DIST_EXTRA_CONFIG}) - find_program(STRIP_EXECUTABLE strip) - if(STRIP_EXECUTABLE) - ExternalProject_Add_Step(build_ninja strip_executables - DEPENDEES ${NINJA_BUILD_LAST_STEP} - COMMENT "Stripping CMake executables" - COMMAND ${STRIP_EXECUTABLE} ${ninja_executable} - USES_TERMINAL 1 - ) - set(NINJA_BUILD_LAST_STEP "strip_executables") - endif() - - if(RUN_NINJA_TEST) - ExternalProject_Add_Step(build_ninja run_ninja_test_suite - DEPENDEES ${NINJA_BUILD_LAST_STEP} - COMMENT "Running Ninja test suite" - COMMAND ${Ninja_BINARY_DIR}/ninja_test${CMAKE_EXECUTABLE_SUFFIX} - WORKING_DIRECTORY ${Ninja_BINARY_DIR} - USES_TERMINAL 1 - ) - set(NINJA_BUILD_LAST_STEP "run_ninja_test_suite") - endif() -endif() d31 3 a33 3 install(FILES ${Ninja_SOURCE_DIR}/misc/ninja_syntax.py DESTINATION src/ninja) -install(PROGRAMS ${ninja_executable} DESTINATION src/ninja/data/bin) +#install(PROGRAMS ${ninja_executable} DESTINATION src/ninja/data/bin) @