Date: Mon, 21 Feb 2022 02:57:43 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: dev-commits-ports-main@freebsd.org Cc: Rene Ladan <rene@FreeBSD.org> Subject: Re: git: a23dfd214ae0 - main - www/chromium: update to 98.0.4758.102 Message-ID: <20220221025743.6878b1fe118878eb5053c3ba@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> .include <bsd.port.pre.mk> +# 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 <rene_at_FreeBSD.org> > AuthorDate: 2022-02-20 11:35:15 +0000 > Commit: Rene Ladan <rene_at_FreeBSD.org> > 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 <robert_at_openbsd.org> > 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 <junchoon@dec.sakura.ne.jp> --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 <bsd.port.options.mk> .include <bsd.port.pre.mk> +# 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220221025743.6878b1fe118878eb5053c3ba>