From nobody Sat Oct 29 19:39:32 2022 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 4N08r45mTjz4ggts; Sat, 29 Oct 2022 19:39:32 +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 4N08r45Lgxz3QhQ; Sat, 29 Oct 2022 19:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667072372; 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=GDrtSuNIEHkE7QphBS0LddroaUOXyvNsCDvKijy5pSU=; b=cGFcL9wKKrYZ2nR47QZ44YIMLnGV91EenZvA45c3tr75HoDhsZEzpzo9HL8HI1O784KISE HTBx2+FD1C6EBFDm1PpLs7vvXreaVZPjXtP8f4MQJEjvwqljEgaKHybhXAwv3sOgrg0Bbs DWO/irQEw+xq32ov2uLI24il2cuhw7boBLZYxpsKul8R0OMORQnZk7U7CnMONMaJiK0Wj9 Xm2Mt2lazXQLWTUz3LLT3VY7BpytRQF6GjS/4XRfIWGcNRsPosPh+AOLctkNg87mUNoid+ uZlWdrVXhIFKZ3lMQzVHosR3fCpqCOiEvD9gtd0AjQgU3PFdW1gznfhShFFpcg== 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 4N08r44S3HzV4L; Sat, 29 Oct 2022 19:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29TJdWxO031170; Sat, 29 Oct 2022 19:39:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TJdW1V031169; Sat, 29 Oct 2022 19:39:32 GMT (envelope-from git) Date: Sat, 29 Oct 2022 19:39:32 GMT Message-Id: <202210291939.29TJdW1V031169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 3c5189a0fd4c - main - Mk/Uses/cmake.mk: Define -DNDEBUG when BUILD_TYPE is set to RELEASE 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: owner-dev-commits-ports-main@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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c5189a0fd4c82addfb659024bf28c5006bf88f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667072372; 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=GDrtSuNIEHkE7QphBS0LddroaUOXyvNsCDvKijy5pSU=; b=gj+HWeUWGVP71dHY7Jv+6XWllV5O5+OlF1A7TE2caQq1/o8B7o+lHghDR1SD5FmlG7SPde vMWz59bikGKZk1Z/VR+xIKvqg5Xwxyq4NL95EHitzKcB62LnRkt/XCgUxg6HINlyvL5eK3 KX53XOUYDbwurhDl8C0zYWwv+jXkWajurfgfkBVaqcCO1V6Ro3B5X9gP5HE7Vs3BLB6mAd 757c1OP4nXs98WBT1p7WDQlWSe7eUZ7pCYCgu1AHW9EmeESw0uJLimbpanA8+Wwmep2LZb 6vrBGux+U4astc9k9p4tXldNnLxmmvZCgAC3YY1aOF9jMApjOJplHZc/dMKBlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667072372; a=rsa-sha256; cv=none; b=ZgDk3rJ3/G9wIZEmrpmkN2IllekBev9lAA7hCQnfo8JgmJAmElBglX3RLuWHqA06hpZxck wBtpFfgkzO5sr7NRbs+x/YalDo5Xf11JMqpTyTntD2wv0OeYIV8Y4XlkflPl6LyNgRF94l rcJcWf7AzmFgtIcLX9kS8hERUdP6dfa8u2nHxIbohTiQ0KO1ox3Qby3ZHtAbbXwPuSigCx CXNDhVDelCQtyPRTjC/PoeIqxHVzs3oUiwM6GFmrlhwoIy9O7itXkHWOwcrqiXr0BmRNaa 330Lz2gl0e1fWsyQamIzXaSJIUgyXOkRjZMHoE8u/XK45Lq+U1E6WRQX7Np20g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c5189a0fd4c82addfb659024bf28c5006bf88f7 commit 3c5189a0fd4c82addfb659024bf28c5006bf88f7 Author: Daniel Engberg AuthorDate: 2022-10-29 19:27:02 +0000 Commit: Daniel Engberg CommitDate: 2022-10-29 19:38:58 +0000 Mk/Uses/cmake.mk: Define -DNDEBUG when BUILD_TYPE is set to RELEASE CMake defines -DNDEBUG when BUILD_TYPE is set to RELEASE by default however default flags gets dropped when CMAKE_C_FLAGS_RELEASE and CMAKE_CXX_FLAGS_RELEASE are (re)defined. This causes some projects to build with debugging by default which needs to be disabled by hand if they do not set -DNDEBUG manually either in ports Makefile and/or in CMake's Makefile. To follow upstream add -DNDEBUG to our RELEASE flags. PR: 266721 Reviewed by: arrowd Approved by: portmgr (tcberner) Differential Revision: https://reviews.freebsd.org/D36695 Exp-run by: antoine --- Mk/Uses/cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index d739cb1e3fdc..bba26ba1c816 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -79,10 +79,10 @@ CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_C_FLAGS_DEBUG:STRING="${CFLAGS}" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS}" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS} -DNDEBUG" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \