Attachment 227730 Details for Bug 258271 – 0001-www-chromium-improve-test-for-mempcpy.patch (v2)

[patch] 0001-www-chromium-improve-test-for-mempcpy.patch (v2)

0001-www-chromium-improve-test-for-mempcpy.patch (text/plain), 1.45 KB, created by Felix Palmen on 2021-09-07 06:39:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2021-09-07 06:39:06 UTC

Size: 1.45 KB

patch

obsolete

>From dbcc726b4f13cb6e0f992319fb2aea96f32b88d0 Mon Sep 17 00:00:00 2001
>From: Felix Palmen <felix@palmen-it.de>
>Date: Sun, 5 Sep 2021 13:19:57 +0200
>Subject: [PATCH] www/chromium: improve test for mempcpy()
>
>The current test using grep is executed every time the Makefile is
>evaluated, and make prints a warning when it fails.
>
>Make sure to only execute the test when EXTRA_PATCHES is expanded, and
>silence the warning by enforcing a successful exit with || ${TRUE}.
>
>PR:	258271
>---
> www/chromium/Makefile | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/www/chromium/Makefile b/www/chromium/Makefile
>index ebc1697d58ca..2f8b84dbcbd1 100644
>--- a/www/chromium/Makefile
>+++ b/www/chromium/Makefile
>@@ -208,10 +208,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
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 258271: 227679 | 227685 | 227730 | 231957 | 231961 | 231983