From nobody Thu Apr 11 17:54:45 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VFnQZ0VClz5HpTX; Thu, 11 Apr 2024 17:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFnQZ041Dz4Y4s; Thu, 11 Apr 2024 17:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712858086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9T5jS/byvLNLdmHRhpneIODoaGCHulBY8GUf3T9fVc=; b=g/kkZ6FfoQCBq6dQacihXtEof1kS/a/LX7VW/9kanTbnP9UqxVVTcBUys072LJZO7HVabM hszpwCsIf0zqE1fey29Qg/vX0Vx3eHxraBYrxaUsxMyfbUdo86/ceDv67+viXjFmOgEhuQ S0UltXHjkwMHhYKT6EyhzVoroMnH72TPv58jKmsOS+/okXkomT8HeToHnCOtetBrjw3+sy SslEcVF4WMgpAo5V0Fpm9i0Kl6CkSHGr7nD5QJAeDcIVR2XK6ShdAkqkGA3V0IzkoCADvB pj9HeyOBNL0eXwX84VB1e+hqolr6qm4A8L1vHp2baOTJi6JWNwgiXFh96Npqwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712858086; a=rsa-sha256; cv=none; b=hv31ZBKl8QC5K/Llb77Jm9GSVxaeJIaQfZpFqZgLktVRxmoYSQM0oXxKO5Gf6qGPJ+X90g fyzWRXj7vWUB8HwHj9QukLqv34S8sq17HURgdMjr1Yiz5RP7gBBcLPw2qk/hGnYnrovwOC 5IeINlyixUJi/7Y4IwDjkuJvtUiVKeg4WOLbePPrQHNRzFiV9cWsVHrxaArqTgyt1fV7Gd 0Axd+9Se/WVX+s0NQYkMxOln4X7gb1QWZb8DQjcesrceelv6vnxowKg9jdgV4wBm7R5q20 rwVvfzkKr9UvPy1cLD8pgQWnjv1FQjS0d0dRUjrJTD/cdqMmEwIPyfvwDfBcTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712858086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P9T5jS/byvLNLdmHRhpneIODoaGCHulBY8GUf3T9fVc=; b=mSZ686CJkNYVPmx+4g+AiScfiRMNOy0dNcvY8pB9aMExzD9fxj/vdraojXn0fYN2XaOPUc qikgOYnAS1YkhPAHR7vaysTqN8siMIJqBA2pTScGyEcILJd9IdejqQ61RbWFGDsFb7AajH 0a3U7sjw261sAMStMveyjcQQhCW8t6OGYckWhJ3e5PU5mwNyWgdRvNdnaFn/tY7UrCDb2h 2+vH3bz5TbFOWmSHTSwW3NEB/75NwupGVhNPZMjcfOQc5PKm0JvR0hxjJpEkimfDGh/SVf GVtGUCMP1y8h3R6iXZX/zE7tX1v8Of+OI2o0WlC9ZaTGBhhvRkZRf7bWhob1gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFnQY6lxrzFwB; Thu, 11 Apr 2024 17:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BHsj0x004075; Thu, 11 Apr 2024 17:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BHsjgV004072; Thu, 11 Apr 2024 17:54:45 GMT (envelope-from git) Date: Thu, 11 Apr 2024 17:54:45 GMT Message-Id: <202404111754.43BHsjgV004072@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 665b0219e541 - main - Mk/Uses: Fix feature checks after my previous {WITH,WITHOUT}_*_PORTS change List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-main+owner@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 665b0219e541019b849fd5a1efdf032081dcf610 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=665b0219e541019b849fd5a1efdf032081dcf610 commit 665b0219e541019b849fd5a1efdf032081dcf610 Author: Gleb Popov AuthorDate: 2024-04-11 12:13:15 +0000 Commit: Gleb Popov CommitDate: 2024-04-11 17:53:11 +0000 Mk/Uses: Fix feature checks after my previous {WITH,WITHOUT}_*_PORTS change Test Plan: Take cmake.mk for example. Choosing a port with USES=cmake and running `make -V CMAKE_BUILD_TYPE` gives "Release" and `make -V CMAKE_BUILD_TYPE WITH_DEBUG=yes` gives "Debug". However, `make -V CMAKE_BUILD_TYPE WITH_DEBUG_PORTS=this/port` still gives "Release" unless this change is applied. Differential Revision: https://reviews.freebsd.org/D44748 Fixes: d697653cffd19ddaf3cdee2589a830c72ab39777 Approved by: bapt --- Mk/Uses/cargo.mk | 2 +- Mk/Uses/cmake.mk | 8 ++++---- Mk/Uses/go.mk | 4 ++-- Mk/Uses/grantlee.mk | 2 +- Mk/Uses/meson.mk | 4 ++-- Mk/Uses/php.mk | 2 +- Mk/Uses/qmake.mk | 6 +++--- Mk/Uses/qt-dist.mk | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index e3b733d35821..8f6bf1576723 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -194,7 +194,7 @@ CARGO_INSTALL_ARGS+= --features='${CARGO_FEATURES:N--no-default-features}' CARGO_TEST_ARGS+= --features='${CARGO_FEATURES:N--no-default-features}' . endif -. if !defined(WITH_DEBUG) +. if !defined(_WITH_DEBUG) CARGO_BUILD_ARGS+= --release CARGO_TEST_ARGS+= --release . else diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index 4129f0f341fc..307bd04d98f8 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -83,13 +83,13 @@ BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core RUN_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core . endif -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) CMAKE_BUILD_TYPE?= Debug -. elif defined(WITH_DEBUGINFO) +. elif defined(_WITH_DEBUGINFO) CMAKE_BUILD_TYPE?= RelWithDebInfo . else CMAKE_BUILD_TYPE?= Release -. endif #defined(WITH_DEBUG) +. endif #defined(_WITH_DEBUG) CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ @@ -128,7 +128,7 @@ CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF . endif . if empty(cmake_ARGS:Mindirect) -. if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) && !defined(WITH_DEBUGINFO) +. if defined(STRIP) && ${STRIP} != "" && !defined(_WITH_DEBUG) && !defined(_WITH_DEBUGINFO) INSTALL_TARGET?= install/strip . endif . endif diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk index 1836f8972357..6d65fc2c22bc 100644 --- a/Mk/Uses/go.mk +++ b/Mk/Uses/go.mk @@ -90,13 +90,13 @@ GO_PKGNAME= ${PORTNAME} GO_TARGET?= ${GO_PKGNAME} GO_TESTTARGET?= ./... -. if !defined(PIE_UNSAFE) && defined(WITH_PIE) && ${ARCH} == amd64 +. if !defined(PIE_UNSAFE) && defined(_WITH_PIE) && ${ARCH} == amd64 GO_BUILDFLAGS+= -buildmode=pie . else GO_BUILDFLAGS+= -buildmode=exe . endif GO_BUILDFLAGS+= -v -trimpath -. if !defined(WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*) +. if !defined(_WITH_DEBUG) && empty(GO_BUILDFLAGS:M-ldflags*) GO_BUILDFLAGS+= -ldflags=-s . endif GO_TESTFLAGS+= -v diff --git a/Mk/Uses/grantlee.mk b/Mk/Uses/grantlee.mk index f050981966f1..23ceb969743f 100644 --- a/Mk/Uses/grantlee.mk +++ b/Mk/Uses/grantlee.mk @@ -65,7 +65,7 @@ PLIST_SUB+= GRANTLEE_VERSION_FULL=${GRANTLEE_VERSION} \ # GrantleeMacros.cmake provides grantlee_adjust_plugin_name() which appends a # letter 'd' to the library name in Debug mode. Provide a PLIST_SUB which can be # appended in the plist. -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) PLIST_SUB+= GRANTLEE_DEBUG_SUFFIX=d . else PLIST_SUB+= GRANTLEE_DEBUG_SUFFIX="" diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index 571e8a990be0..c4c57af3fa18 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -51,9 +51,9 @@ CONFIGURE_ARGS+= -Db_colorout=never INSTALL_TARGET= install # should we have strip separate from WITH_DEBUG? -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) CONFIGURE_ARGS+= --buildtype debug -. elif defined(WITH_DEBUGINFO) +. elif defined(_WITH_DEBUGINFO) CONFIGURE_ARGS+= --buildtype debugoptimized . else CONFIGURE_ARGS+= --buildtype release \ diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index 6195ad71a71e..0192a4d73197 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -208,7 +208,7 @@ PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts . endif -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug . endif PHP_SAPI?= "" diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index 926d98002b53..4090e1303419 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -16,7 +16,7 @@ # norecursive Don't pass -recursive argument to qmake binary # outsource Perform an out-of-source build # no_env Suppress modification of configure and make environment. -# no_configure Don't add the configure target -- this is implied by +# no_configure Don't add the configure target -- this is implied by # HAS_CONFIGURE=yes and GNU_CONFIGURE=yes # # @@ -75,7 +75,7 @@ QMAKE_ARGS+= -spec ${QMAKESPEC} \ QMAKE_CXXFLAGS_RELEASE="" \ PREFIX="${PREFIX}" -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) PLIST_SUB+= DEBUG="" QMAKE_ARGS+= CONFIG+="debug separate_debug_info" \ CONFIG-="release" @@ -83,7 +83,7 @@ QMAKE_ARGS+= CONFIG+="debug separate_debug_info" \ PLIST_SUB+= DEBUG="@comment " QMAKE_ARGS+= CONFIG+="release" \ CONFIG-="debug separate_debug_info" -. endif # defined(WITH_DEBUG) +. endif # defined(_WITH_DEBUG) # We set -recursive by default to keep qmake from running in the build stage. . if ! ${qmake_ARGS:Mnorecursive} diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index 9b0b4d5ee08e..5b434c1d21f9 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -239,7 +239,7 @@ CONFIGURE_ARGS+= -no-use-gold-linker CONFIGURE_ARGS+= -recheck-all . endif # ${_QT_VER:M5} -. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) +. if defined(WANT_QT_DEBUG) || defined(_WITH_DEBUG) WITH_DEBUG= yes STRIP= # It's done prior to bsd.qt.mk inclusion. CONFIGURE_ARGS+= -debug -separate-debug-info @@ -250,7 +250,7 @@ QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \ CONFIGURE_ARGS+= -release -no-separate-debug-info QMAKE_ARGS+= QT_CONFIG+="release" \ QT_CONFIG-="debug separate_debug_info" -. endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) +. endif # defined(WANT_QT_DEBUG) || defined(_WITH_DEBUG) . if defined(WANT_QT_VERBOSE_CONFIGURE) CONFIGURE_ARGS+= -verbose @@ -302,7 +302,7 @@ QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ FULLVER=${_QT_VERSION:C/-.*//} -. if defined(WITH_DEBUG) +. if defined(_WITH_DEBUG) PLIST_SUB+= DEBUG="" \ NO_DEBUG="@comment " . else