Date: Mon, 22 Jul 2024 14:53:21 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4cabd8470e6f - main - devel/electron*: Fix build on main Message-ID: <202407221453.46MErLx1032053@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cabd8470e6f17b63a0efc02a8634a3ccb0a6a17 commit 4cabd8470e6f17b63a0efc02a8634a3ccb0a6a17 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2024-07-21 15:40:37 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2024-07-22 14:52:33 +0000 devel/electron*: Fix build on main After src snapshot 0c47b9c211, 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); | ^ - Restore a default definition of HAVE_MEMPCPY to indicate that mempcpy(3) is available. It has been part of FreeBSD since 13.1. - Remove a patch used to detect mempcpy(3) in /usr/include/string.h. It is no longer necessary and does not detect the function after src snapshot 0c47b9c211. Approved by: tagattie (maintainer) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46054 --- devel/electron27/files/patch-third__party_nasm_BUILD.gn | 16 ---------------- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- devel/electron28/files/patch-third__party_nasm_BUILD.gn | 16 ---------------- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- devel/electron29/files/patch-third__party_nasm_BUILD.gn | 16 ---------------- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- devel/electron30/files/patch-third__party_nasm_BUILD.gn | 16 ---------------- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- devel/electron31/files/patch-third__party_nasm_BUILD.gn | 16 ---------------- .../files/patch-third__party_nasm_config_config-linux.h | 11 ++--------- 10 files changed, 10 insertions(+), 125 deletions(-) diff --git a/devel/electron27/files/patch-third__party_nasm_BUILD.gn b/devel/electron27/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 index 7f0c88305491..000000000000 --- a/devel/electron27/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/devel/electron27/files/patch-third__party_nasm_config_config-linux.h b/devel/electron27/files/patch-third__party_nasm_config_config-linux.h index 09dd91632b61..fb5433dbb768 100644 --- a/devel/electron27/files/patch-third__party_nasm_config_config-linux.h +++ b/devel/electron27/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-02-01 18:45:20 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #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 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/devel/electron28/files/patch-third__party_nasm_BUILD.gn b/devel/electron28/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 index 7f0c88305491..000000000000 --- a/devel/electron28/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/devel/electron28/files/patch-third__party_nasm_config_config-linux.h b/devel/electron28/files/patch-third__party_nasm_config_config-linux.h index 09dd91632b61..fb5433dbb768 100644 --- a/devel/electron28/files/patch-third__party_nasm_config_config-linux.h +++ b/devel/electron28/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-02-01 18:45:20 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #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 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/devel/electron29/files/patch-third__party_nasm_BUILD.gn b/devel/electron29/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 index 7f0c88305491..000000000000 --- a/devel/electron29/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/devel/electron29/files/patch-third__party_nasm_config_config-linux.h b/devel/electron29/files/patch-third__party_nasm_config_config-linux.h index 09dd91632b61..fb5433dbb768 100644 --- a/devel/electron29/files/patch-third__party_nasm_config_config-linux.h +++ b/devel/electron29/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-02-01 18:45:20 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #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 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/devel/electron30/files/patch-third__party_nasm_BUILD.gn b/devel/electron30/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 index 7f0c88305491..000000000000 --- a/devel/electron30/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/devel/electron30/files/patch-third__party_nasm_config_config-linux.h b/devel/electron30/files/patch-third__party_nasm_config_config-linux.h index 09dd91632b61..fb5433dbb768 100644 --- a/devel/electron30/files/patch-third__party_nasm_config_config-linux.h +++ b/devel/electron30/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-02-01 18:45:20 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #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 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1 diff --git a/devel/electron31/files/patch-third__party_nasm_BUILD.gn b/devel/electron31/files/patch-third__party_nasm_BUILD.gn deleted file mode 100644 index 7f0c88305491..000000000000 --- a/devel/electron31/files/patch-third__party_nasm_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/nasm/BUILD.gn.orig 2023-02-01 18:45:20 UTC -+++ third_party/nasm/BUILD.gn -@@ -63,6 +63,13 @@ config("nasm_config") { - - defines = [ "HAVE_CONFIG_H" ] - -+ _string_h_lines = -+ read_file("/usr/include/string.h", "list lines") -+ _mempcpy = filter_include(_string_h_lines, [ "*\*mempcpy*" ]) -+ if (_mempcpy != []) { -+ defines += [ "HAVE_MEMPCPY=1" ] -+ } -+ - if (is_clang) { - cflags = [ - # The inline functions in NASM's headers flag this. diff --git a/devel/electron31/files/patch-third__party_nasm_config_config-linux.h b/devel/electron31/files/patch-third__party_nasm_config_config-linux.h index 09dd91632b61..fb5433dbb768 100644 --- a/devel/electron31/files/patch-third__party_nasm_config_config-linux.h +++ b/devel/electron31/files/patch-third__party_nasm_config_config-linux.h @@ -1,4 +1,4 @@ ---- third_party/nasm/config/config-linux.h.orig 2023-02-01 18:45:20 UTC +--- third_party/nasm/config/config-linux.h.orig 2024-06-13 07:44:30 UTC +++ third_party/nasm/config/config-linux.h @@ -160,7 +160,7 @@ @@ -18,7 +18,7 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -327,16 +327,16 @@ +@@ -327,10 +327,10 @@ #define HAVE_ISASCII 1 /* Define to 1 if you have the `iscntrl' function. */ @@ -31,13 +31,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #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 @@ -357,7 +357,7 @@ #define HAVE_STDARG_H 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407221453.46MErLx1032053>