aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorFelix Palmen <felix@palmen-it.de>2021-09-23 19:32:24 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2021-09-24 02:46:13 +0000
commit289869de6aa59a3089a60054f10ed97d4f6b491b (patch)
tree3973e08009c4bac604347cc8259ed49f24ef3dee /www
parentfae27f575deb8a4f41c2fb0679a1eb74a1704f7e (diff)
downloadports-289869de6aa59a3089a60054f10ed97d4f6b491b.tar.gz
ports-289869de6aa59a3089a60054f10ed97d4f6b491b.zip
www/chromium: Tweak mempcpy check to silence a warning
PR: 258271
Diffstat (limited to 'www')
-rw-r--r--www/chromium/Makefile9
1 files 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 <bsd.port.options.mk>
.include <bsd.port.pre.mk>
-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