From nobody Mon Jul 22 14:53:21 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WSNZ92W51z5R4sL; Mon, 22 Jul 2024 14:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSNZ91yyJz57Pn; Mon, 22 Jul 2024 14:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721660001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3N9FL8hBXtb56LuBDklaX3nkA5DYdcbR7g8D9NCVXz4=; b=JDzQSlnabamB8P2xbdBMxWC7VXlJAuVQRMMU93tjjyTz02ZYseSJujMoQrxgyrOCy7BGja mBN3paFOxmf7xaoAUxjN80NaRa3URIZAAoOHbRR3q6TgAGBfsn/yAH2QdmJax09qG/JBvF qOmDM1sLkKfVgY/UX/cUcMIAIH1KBm30PZLtaEbDn1bwXsJRoR7ysD6CUkUXPfhv7bwYF/ 2m2QFZQR4zQZ7SVgPDnys9Ja/hkXvr6XF3PMdasPX5eS1Q9NdHtxHU5HHD6U+co66j2Aio hTI20PKvhF0orn/5Prrn+5s+dE1qhzNWIeD8aDzs84qkVej7PUAoZBCse++UyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721660001; a=rsa-sha256; cv=none; b=oG4t4OcLQfupYk5cjPUK+9wtJKD1FUWuVJLMOtJ3ciKiZM8WEnubWJHMM+JFWKewi9r/By BS1Puhcht/mHjYHCigwUmtVQWnWK+bx9k2Gu2R/xkvglfD2A/s4qMwwv2UxnZCSFo0I3Gs 89OjJYaoWfK7EpC1FDC+0Ctte2O+DlBo+qlDO2944TUaCXEhvGF/InvxETdbHLzehzDjq9 zz0qkhRzIiMm4RhY7xhvxCv4b9e3GRen+ODMfDbAfV6OHD9glT6axxCr2vs1fvuPz4Dhqh LZ0MCpHIC6fAE1Fr7cNWCFqvW9Bb/s2YJW8tvMkWTkTmOW37rcdjhu1xiXICmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721660001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3N9FL8hBXtb56LuBDklaX3nkA5DYdcbR7g8D9NCVXz4=; b=uQsUMJs1EQ6BUGkgEC3yf1PN+5XQ8QwxkgbD800goJZGYKvVDFeNn7FydfIQBHn7JFcxeH 9Hhu66wBQhAoNe1HX8clROwlhVC355UcXHxreEmp6+5vLvElEZCHHYGCK4e82fhhA590Jv IjBPuIeWjJLdHt9VCl5fBjaF8BAiaVmF7f9hNibfC0uGTETiNgLJtkgKETvdLfVyOblD1X SjYfdmiGBBC/QvX6nIPq26Yy6TxZGP1v4Q0y9Yr3VeDtNdNarARl2+JV80LjPdrw/9bgqZ JDtZWipDA49MW7O+5q0qKbzC8ItD/HjPVZC3CYMrTOzejxEGE3deokFEcU5ejA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WSNZ91YrtzpxB; Mon, 22 Jul 2024 14:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MErL7D032056; Mon, 22 Jul 2024 14:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MErLx1032053; Mon, 22 Jul 2024 14:53:21 GMT (envelope-from git) Date: Mon, 22 Jul 2024 14:53:21 GMT Message-Id: <202407221453.46MErLx1032053@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 4cabd8470e6f - main - devel/electron*: Fix build on main List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cabd8470e6f17b63a0efc02a8634a3ccb0a6a17 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cabd8470e6f17b63a0efc02a8634a3ccb0a6a17 commit 4cabd8470e6f17b63a0efc02a8634a3ccb0a6a17 Author: Joseph Mingrone AuthorDate: 2024-07-21 15:40:37 +0000 Commit: Joseph Mingrone 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 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 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 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 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 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