git: 93e25e566d1a - main - www/{*chromium,iridium}: Fix build after src snapshot 0c47b9c211
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Jul 2024 16:14:47 UTC
The branch main has been updated by jrm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=93e25e566d1a6905e0f3cc928fc40f504f25ef8d
commit 93e25e566d1a6905e0f3cc928fc40f504f25ef8d
Author: Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2024-07-23 21:56:41 +0000
Commit: Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2024-07-28 16:12:23 +0000
www/{*chromium,iridium}: Fix build after src snapshot 0c47b9c211
After src snapshot 0c47b9c211e, the build began failing with:
../../third_party/nasm/include/compiler.h:249:21: error: static
declaration of 'mempcpy' follows non-static declaration
249 | static inline void *mempcpy(void *dst, const void *src, size_t n)
| ^
/usr/include/string.h:71:8: note: previous declaration is here
71 | void *(mempcpy)(void * __restrict,
const void * __restrict,size_t);
Fix the build by updating the pattern used to detect mempcpy(3) in
string.h.
Reviewed by: rnagy (earlier revision)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D46055
---
www/chromium/files/patch-third__party_nasm_BUILD.gn | 4 ++--
www/iridium/files/patch-third__party_nasm_BUILD.gn | 4 ++--
www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/www/chromium/files/patch-third__party_nasm_BUILD.gn b/www/chromium/files/patch-third__party_nasm_BUILD.gn
index a056b77b8a9a..972f5a6a3831 100644
--- a/www/chromium/files/patch-third__party_nasm_BUILD.gn
+++ b/www/chromium/files/patch-third__party_nasm_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/nasm/BUILD.gn.orig 2023-01-11 09:17:16 UTC
+--- third_party/nasm/BUILD.gn.orig 2024-06-24 21:00:43 UTC
+++ third_party/nasm/BUILD.gn
@@ -63,6 +63,13 @@ config("nasm_config") {
@@ -6,7 +6,7 @@
+ _string_h_lines =
+ read_file("/usr/include/string.h", "list lines")
-+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ])
++ _mempcpy = filter_include(_string_h_lines, [ "*mempcpy*" ])
+ if (_mempcpy != []) {
+ defines += [ "HAVE_MEMPCPY=1" ]
+ }
diff --git a/www/iridium/files/patch-third__party_nasm_BUILD.gn b/www/iridium/files/patch-third__party_nasm_BUILD.gn
index 55ef6aa4b880..972f5a6a3831 100644
--- a/www/iridium/files/patch-third__party_nasm_BUILD.gn
+++ b/www/iridium/files/patch-third__party_nasm_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/nasm/BUILD.gn.orig 2023-01-17 19:19:00 UTC
+--- third_party/nasm/BUILD.gn.orig 2024-06-24 21:00:43 UTC
+++ third_party/nasm/BUILD.gn
@@ -63,6 +63,13 @@ config("nasm_config") {
@@ -6,7 +6,7 @@
+ _string_h_lines =
+ read_file("/usr/include/string.h", "list lines")
-+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ])
++ _mempcpy = filter_include(_string_h_lines, [ "*mempcpy*" ])
+ if (_mempcpy != []) {
+ defines += [ "HAVE_MEMPCPY=1" ]
+ }
diff --git a/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn b/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn
index 6db291842f72..972f5a6a3831 100644
--- a/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-third__party_nasm_BUILD.gn
@@ -1,4 +1,4 @@
---- third_party/nasm/BUILD.gn.orig 2023-01-13 08:56:02 UTC
+--- third_party/nasm/BUILD.gn.orig 2024-06-24 21:00:43 UTC
+++ third_party/nasm/BUILD.gn
@@ -63,6 +63,13 @@ config("nasm_config") {
@@ -6,7 +6,7 @@
+ _string_h_lines =
+ read_file("/usr/include/string.h", "list lines")
-+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ])
++ _mempcpy = filter_include(_string_h_lines, [ "*mempcpy*" ])
+ if (_mempcpy != []) {
+ defines += [ "HAVE_MEMPCPY=1" ]
+ }