From nobody Sun Feb 20 17:57:43 2022 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 AC7D819CBC10 for ; Sun, 20 Feb 2022 17:57:55 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from www121.sakura.ne.jp (www121.sakura.ne.jp [153.125.133.21]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4K1tSf1FjRz4W0j; Sun, 20 Feb 2022 17:57:53 +0000 (UTC) (envelope-from junchoon@dec.sakura.ne.jp) Received: from kalamity.joker.local (123-48-130-181.area1b.commufa.jp [123.48.130.181]) (authenticated bits=0) by www121.sakura.ne.jp (8.16.1/8.16.1/[SAKURA-WEB]/20201212) with ESMTPA id 21KHvhMW088591; Mon, 21 Feb 2022 02:57:44 +0900 (JST) (envelope-from junchoon@dec.sakura.ne.jp) Date: Mon, 21 Feb 2022 02:57:43 +0900 From: Tomoaki AOKI To: dev-commits-ports-main@freebsd.org Cc: Rene Ladan Subject: Re: git: a23dfd214ae0 - main - www/chromium: update to 98.0.4758.102 Message-Id: <20220221025743.6878b1fe118878eb5053c3ba@dec.sakura.ne.jp> Organization: Junchoon corps X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Mon__21_Feb_2022_02_57_43_+0900_8SvQc5192DlIi9oq" X-Rspamd-Queue-Id: 4K1tSf1FjRz4W0j X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of junchoon@dec.sakura.ne.jp has no SPF policy when checking 153.125.133.21) smtp.mailfrom=junchoon@dec.sakura.ne.jp X-Spamd-Result: default: False [2.89 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; HAS_ATTACHMENT(0.00)[]; HAS_ORG_HEADER(0.00)[]; NEURAL_HAM_SHORT(-0.89)[-0.891]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:7684, ipnet:153.125.128.0/18, country:JP]; MIME_TRACE(0.00)[0:+,1:+,2:+]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[123.48.130.181:received]; FAKE_REPLY(1.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-diff]; DMARC_NA(0.00)[sakura.ne.jp]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.52)[0.522]; NEURAL_SPAM_LONG(0.86)[0.858]; MLMMJ_DEST(0.00)[dev-commits-ports-main]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --Multipart=_Mon__21_Feb_2022_02_57_43_+0900_8SvQc5192DlIi9oq Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Hi! Unfortunately, this dropped mandated changes for main and stable/13, resulting in build failure. Please revisit (closed) Bug 258271 [1] for details. As it isn't mine, I cannot reopen it. See also Bug 257352 [2] (having older patch and discussion). Attached (for Rene) should resurrect mandated portions. Now running build with this... As ML server would remove attached file, copy&paste the same below, but should be broken by line wrapping. :-( The same patch is uploaded to Bug 258271 [1]. [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258271 [2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257352 Regards. diff --git a/www/chromium/Makefile b/www/chromium/Makefile --- a/www/chromium/Makefile +++ b/www/chromium/Makefile/ @@ -205,6 +205,12 @@ TEST_ALL_TARGET= ${TEST_TARGETS} .include .include +# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. +# Nested variable expansion avoids executing the test when not needed for +# expanding EXTRA_PATCHES. +EXTRA_PATCHES+= ${"${:!${GREP} mempcpy $ {CROSS_SYSROOT}/usr/include/string.h \ + || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} + .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 --- /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 --- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h @@ -42,8 +42,7 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ + #define HAVE_MEMPCPY 1 /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 > The branch main has been updated by rene: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=a23dfd214ae04e8b4d116ca6411570b684eb5ed6 > > commit a23dfd214ae04e8b4d116ca6411570b684eb5ed6 > Author: Rene Ladan > AuthorDate: 2022-02-20 11:35:15 +0000 > Commit: Rene Ladan > CommitDate: 2022-02-20 11:42:02 +0000 > > www/chromium: update to 98.0.4758.102 > > - The port now uses the combined patch set for OpenBSD and FreeBSD > maintained by Robert Nagy. > - Fix build on i386 again. > Obtained from: Robert Nagy > Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html > Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.html > --- (snip) -- Tomoaki AOKI --Multipart=_Mon__21_Feb_2022_02_57_43_+0900_8SvQc5192DlIi9oq Content-Type: text/x-diff; name="chromium-98.0.4758.102-readd_nasm-build-fix.diff" Content-Disposition: attachment; filename="chromium-98.0.4758.102-readd_nasm-build-fix.diff" Content-Transfer-Encoding: 7bit diff --git a/www/chromium/Makefile b/www/chromium/Makefile --- a/www/chromium/Makefile +++ b/www/chromium/Makefile/ @@ -205,6 +205,12 @@ TEST_ALL_TARGET= ${TEST_TARGETS} .include .include +# Add extra-patch-no-mempcpy-nasm only when there's no mempcpy() in base. +# Nested variable expansion avoids executing the test when not needed for +# expanding EXTRA_PATCHES. +EXTRA_PATCHES+= ${"${:!${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h \ + || ${TRUE}!}" == "":?${PATCHDIR}/extra-patch-no-mempcpy-nasm:} + .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 --- /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 --- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h @@ -42,8 +42,7 @@ #define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mempcpy' function. */ --#define HAVE_MEMPCPY 1 -+/* #undef HAVE_MEMPCPY */ + #define HAVE_MEMPCPY 1 /* Define to 1 if you have a working `mmap' system call. */ #define HAVE_MMAP 1 --Multipart=_Mon__21_Feb_2022_02_57_43_+0900_8SvQc5192DlIi9oq--