From nobody Sun Jul 28 16:14:47 2024 X-Original-To: dev-commits-ports-main@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 4WX65N0fKRz5RC1j; Sun, 28 Jul 2024 16:14:48 +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 4WX65M6v6kz4lnD; Sun, 28 Jul 2024 16:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722183288; 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=u5Kq9owjlehLySHbICGuRMO8b0VWsDpWOGKFb6YDtkg=; b=xTPUGC6REIhI68KtMwG1Psb/3K1rGz59MQjFRS1vMS4G9mtEuJHkaaFgZ2Lxk5oRBDu0WH OabZYoZOWe3AP5PIROrzHsg1vHuPhQVub/W2/8injJo/yW99zhj0sA7tqu0ytsf3Ro40Qz IU9JFylZwReIZd9CdsK7IwzEzfzDdhcg8sGaquL/JBRMOWch06wjs126dYV6nPHvHbhZ/C CoGWa7m7UVPeGDFyiKAeCipaFY02+JmaK4hrxEhSZL5I/gH7HpmNwAYX5A932xakCZ6+df vcs/JmOF17VyVHEebYuwAHf5JLKvIcGWBz8hCmn3hxvT5i+Embe0Tt/jPqgvMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722183288; a=rsa-sha256; cv=none; b=V7SArun5kYZy1vvVt+o8CYDW0Y1d65/6CvHEVZUKl9bEazBlDu2JjpP/lgYb8EgjL9+Kuh wF8eUuHpCcSNFC1YL4fmLngT14VWa2ng/PrqL5SSI0MHn/jBUMw0gP2Uh6MLe5T7nmOID8 cv/cuLz+IsM2CTWXpNoDYsKkNzHpyud3Tx/EubTSFGslTNevuNtkmFIC330NG3aSQM8/ER gEoiXNjRUMJK7h9KGvyRlvnYABNr1chWHFFy3v9UpWGjq71k3epYbM9gZ6KrB7GdXF+udI XZ95qWEpou+8zyKvQw/0vkKLW7z51vMb/kG9DDEKcHruJ8XNoRVVisZpV9hhjA== 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=1722183288; 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=u5Kq9owjlehLySHbICGuRMO8b0VWsDpWOGKFb6YDtkg=; b=FMhO3mdKEP7G+wZAs14OkFdtS2J6CZX7ChHrn3+xGw1Qg1hoVp3wL0u85KhL3zidjO2kiv ODakjxU1MD/7qWdj5cynLpPSYAqcqE0SjDUe9BOLAi4UyRrx4onz+rshkdnVbAc5hXYJxC 3kVJBFAJ9Qdhe4fCB/GUxlZqJrfOEafCQHSFXQdGIlQM+opVgBC3Vxo5P1WrpQOXAHeF2u u/KsFeSas6m+GKuJOjsidnzcXUD9+EagCgboeY6Gp17JTOv1jLBiVhZjfJ2+0yEZUMBR5w O2uJTrGO6AspX8dyaqvMUIORFkUYaO8jPx+jlX9qcqsDiIiC1xbzvF6HGr7Byg== 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 4WX65M6VKnzxPy; Sun, 28 Jul 2024 16:14:47 +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 46SGElo0026793; Sun, 28 Jul 2024 16:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46SGEldI026790; Sun, 28 Jul 2024 16:14:47 GMT (envelope-from git) Date: Sun, 28 Jul 2024 16:14:47 GMT Message-Id: <202407281614.46SGEldI026790@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: 93e25e566d1a - main - www/{*chromium,iridium}: Fix build after src snapshot 0c47b9c211 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 93e25e566d1a6905e0f3cc928fc40f504f25ef8d Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=93e25e566d1a6905e0f3cc928fc40f504f25ef8d commit 93e25e566d1a6905e0f3cc928fc40f504f25ef8d Author: Joseph Mingrone AuthorDate: 2024-07-23 21:56:41 +0000 Commit: Joseph Mingrone 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" ] + }