From owner-dev-commits-ports-all@freebsd.org Wed Sep 1 10:27:17 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CFD5F667668; Wed, 1 Sep 2021 10:27:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H00c55Y0zz3q7f; Wed, 1 Sep 2021 10:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A258F2375C; Wed, 1 Sep 2021 10:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 181ARHOf004682; Wed, 1 Sep 2021 10:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 181ARHgq004681; Wed, 1 Sep 2021 10:27:17 GMT (envelope-from git) Date: Wed, 1 Sep 2021 10:27:17 GMT Message-Id: <202109011027.181ARHgq004681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 9e6695a71d64 - main - www/chromium: fix build on CURRENT MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e6695a71d64d995e6619497626c0a780397b7c9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Sep 2021 10:27:17 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e6695a71d64d995e6619497626c0a780397b7c9 commit 9e6695a71d64d995e6619497626c0a780397b7c9 Author: Tomoaki AOKI AuthorDate: 2021-08-30 16:10:28 +0000 Commit: Rene Ladan CommitDate: 2021-09-01 10:09:23 +0000 www/chromium: fix build on CURRENT ... after mempcpy(3) has been added to base libc. PR: 257352 MFH: 2021Q3 --- www/chromium/Makefile | 5 +++++ www/chromium/files/extra-patch-no-mempcpy-nasm | 11 +++++++++++ .../files/patch-third__party_nasm_config_config-linux.h | 9 --------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 7ea8aca712e6..2613b70a6fe3 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -204,6 +204,11 @@ TEST_ALL_TARGET= ${TEST_TARGETS} .include .include +BASE_MEMPCPY!= ${GREP} mempcpy ${CROSS_SYSROOT}/usr/include/string.h +.if empty(BASE_MEMPCPY) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-mempcpy-nasm +.endif + .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 new file mode 100644 index 000000000000..2a62e36e7edf --- /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 index 49222955f6ff..40a1ec91b76b 100644 --- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h @@ -18,15 +18,6 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -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 @@ -411,7 +411,7 @@ #define HAVE_SYSCONF 1