diff options
| -rw-r--r-- | devel/ninja/Makefile | 20 | ||||
| -rw-r--r-- | devel/ninja/distinfo | 6 |
2 files changed, 18 insertions, 8 deletions
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile index d0fadd033690..9fd19b22fbbb 100644 --- a/devel/ninja/Makefile +++ b/devel/ninja/Makefile @@ -1,5 +1,5 @@ PORTNAME= ninja -PORTVERSION= 1.11.1 +PORTVERSION= 1.12.0 DISTVERSIONPREFIX= v PORTEPOCH= 2 CATEGORIES= devel @@ -11,12 +11,10 @@ WWW= https://ninja-build.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING +USES= python USE_GITHUB= yes GH_ACCOUNT= ninja-build -CONFLICTS= irc/ninja -USES= python - PORTSCOUT= limit:^1\. PLIST_FILES= bin/ninja @@ -28,12 +26,24 @@ OPTIONS_DEFAULT= BASH ZSH BASH_PLIST_FILES= share/bash-completion/completions/ninja ZSH_PLIST_FILES= share/zsh/site-functions/_ninja +# Set up the environment variables that ninja's configure.py recognizes and +# respect building with ccache. +NINJA_ENV= AR="${AR}" \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" +.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE) +NINJA_ENV+= CXX="${CCACHE_BIN} ${CXX}" +.else +NINJA_ENV+= CXX="${CXX}" +.endif + post-patch: @${REINPLACE_CMD} "s/'-g', //" ${WRKSRC}/configure.py do-build: @(cd ${WRKSRC} && \ - CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap) + ${SETENVI} ${CONFIGURE_ENV} ${NINJA_ENV} ${PYTHON_CMD} configure.py --bootstrap --verbose) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin diff --git a/devel/ninja/distinfo b/devel/ninja/distinfo index 2bc71e7426ee..6d1c18739ea2 100644 --- a/devel/ninja/distinfo +++ b/devel/ninja/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662060193 -SHA256 (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea -SIZE (ninja-build-ninja-v1.11.1_GH0.tar.gz) = 229479 +TIMESTAMP = 1714464552 +SHA256 (ninja-build-ninja-v1.12.0_GH0.tar.gz) = 8b2c86cd483dc7fcb7975c5ec7329135d210099a89bc7db0590a07b0bbfe49a5 +SIZE (ninja-build-ninja-v1.12.0_GH0.tar.gz) = 240291 |