git: 5218b91edff5 - 2021Q3 - www/chromium: fix build on CURRENT

[Rene Ladan]

The branch 2021Q3 has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5218b91edff502d736eec1e4db6eb23b44638839

commit 5218b91edff502d736eec1e4db6eb23b44638839
Author:     Tomoaki AOKI <junchoon at dec.sakura.ne.jp>
AuthorDate: 2021-08-30 16:10:28 +0000
Commit:     Rene Ladan <rene at FreeBSD.org>
CommitDate: 2021-09-01 20:35:55 +0000

    www/chromium: fix build on CURRENT
    
    ... after mempcpy(3) has been added to base libc.
    
    PR:     257352
    MFH:    2021Q3
    (cherry picked from commit 9e6695a71d64d995e6619497626c0a780397b7c9)
---
 www/chromium/Makefile                                         |  5 +++++
 www/chromium/files/extra-patch-no-mempcpy-nasm                | 11 +++++++++++
 .../files/patch-third__party_nasm_config_config-linux.h       |  9 ---------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7ea8aca712e6..2613b70a6fe3 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -204,6 +204,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
+
 .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
diff --git a/www/chromium/files/extra-patch-no-mempcpy-nasm b/www/chromium/files/extra-patch-no-mempcpy-nasm
new file mode 100644
index 000000000000..2a62e36e7edf
--- /dev/null
+++ b/www/chromium/files/extra-patch-no-mempcpy-nasm
@@ -0,0 +1,11 @@
+--- third_party/nasm/config/config-linux.h.orig	2021-04-14 18:43:05 UTC
++++ third_party/nasm/config/config-linux.h
+@@ -336,7 +336,7 @@
+ #define HAVE_MEMORY_H 1
+ 
+ /* Define to 1 if you have the `mempcpy' function. */
+-#define HAVE_MEMPCPY 1
++/* #undef HAVE_MEMPCPY */
+ 
+ /* Define to 1 if you have a working `mmap' system call. */
+ #define HAVE_MMAP 1
diff --git a/www/chromium/files/patch-third__party_nasm_config_config-linux.h b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
index 49222955f6ff..40a1ec91b76b 100644
--- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h
+++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h
@@ -18,15 +18,6 @@
  
  /* Define to 1 if you have the `faccessat' function. */
  #define HAVE_FACCESSAT 1
-@@ -336,7 +336,7 @@
- #define HAVE_MEMORY_H 1
- 
- /* Define to 1 if you have the `mempcpy' function. */
--#define HAVE_MEMPCPY 1
-+/* #undef HAVE_MEMPCPY */
- 
- /* Define to 1 if you have a working `mmap' system call. */
- #define HAVE_MMAP 1
 @@ -411,7 +411,7 @@
  #define HAVE_SYSCONF 1