From owner-dev-commits-ports-main@freebsd.org Fri Sep 24 02:46:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 56A3E6B3FC6; Fri, 24 Sep 2021 02:46:16 +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 4HFxHX1lqPz3PVc; Fri, 24 Sep 2021 02:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1885069A4; Fri, 24 Sep 2021 02:46:16 +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 18O2kFCu023410; Fri, 24 Sep 2021 02:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18O2kFC1023409; Fri, 24 Sep 2021 02:46:15 GMT (envelope-from git) Date: Fri, 24 Sep 2021 02:46:15 GMT Message-Id: <202109240246.18O2kFC1023409@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 289869de6aa5 - main - www/chromium: Tweak mempcpy check to silence a warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 289869de6aa59a3089a60054f10ed97d4f6b491b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 02:46:16 -0000 The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=289869de6aa59a3089a60054f10ed97d4f6b491b commit 289869de6aa59a3089a60054f10ed97d4f6b491b Author: Felix Palmen AuthorDate: 2021-09-23 19:32:24 +0000 Commit: Joseph Mingrone CommitDate: 2021-09-24 02:46:13 +0000 www/chromium: Tweak mempcpy check to silence a warning PR: 258271 --- www/chromium/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 3feeee1497ea..d4e64b662c0e 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -207,10 +207,11 @@ TEST_ALL_TARGET= ${TEST_TARGETS} .include .include -BASE_MEMPCPY!= ${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h -.if empty(BASE_MEMPCPY) -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-mempcpy-nasm -.endif +# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. +# Nested variable expansion avoids executing the test when not needed for +# expanding EXTRA_PATCHES. +EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ + || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base