From nobody Sun Nov 07 23:43:58 2021 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 75738185080B; Sun, 7 Nov 2021 23:43:59 +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 4HnW6R1GNFz4l40; Sun, 7 Nov 2021 23:43:59 +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 EA03F272B2; Sun, 7 Nov 2021 23:43:58 +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 1A7NhwSM013451; Sun, 7 Nov 2021 23:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A7NhwD8013450; Sun, 7 Nov 2021 23:43:58 GMT (envelope-from git) Date: Sun, 7 Nov 2021 23:43:58 GMT Message-Id: <202111072343.1A7NhwD8013450@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 06a7ac65bd3e - main - devel/elfutils: Fix build after mempcpy(3) and wmempcpy(3) were added 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06a7ac65bd3efb5eb1a1705a55f11acc812d941d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=06a7ac65bd3efb5eb1a1705a55f11acc812d941d commit 06a7ac65bd3efb5eb1a1705a55f11acc812d941d Author: Yuri Victorovich AuthorDate: 2021-11-07 23:42:46 +0000 Commit: Yuri Victorovich CommitDate: 2021-11-07 23:43:55 +0000 devel/elfutils: Fix build after mempcpy(3) and wmempcpy(3) were added PR: 258092 --- devel/elfutils/Makefile | 6 ++++++ devel/elfutils/files/patch-lib_eu-config.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile index 62b2f0e7e3a1..3776e5021b13 100644 --- a/devel/elfutils/Makefile +++ b/devel/elfutils/Makefile @@ -49,6 +49,12 @@ CONFIGURE_ARGS+= --program-prefix=eu- # Disable debuginfod until option support can be added: CONFIGURE_ARGS+= --disable-debuginfod +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300512 # 2021-07-17 +CFLAGS+= -DFREEBSD_HAS_MEMPCPY +.endif + pre-configure: @${CP} -a \ ${LOCALBASE}/share/gnulib/lib/obstack.c \ diff --git a/devel/elfutils/files/patch-lib_eu-config.h b/devel/elfutils/files/patch-lib_eu-config.h index f9502d4abe2a..04549063aa1c 100644 --- a/devel/elfutils/files/patch-lib_eu-config.h +++ b/devel/elfutils/files/patch-lib_eu-config.h @@ -1,6 +1,6 @@ --- lib/eu-config.h.orig 2020-03-30 12:17:45 UTC +++ lib/eu-config.h -@@ -176,6 +176,182 @@ asm (".section predict_data, \"aw\"; .previous\n" +@@ -176,6 +176,186 @@ asm (".section predict_data, \"aw\"; .previous\n" #define ELFUTILS_HEADER(name) @@ -23,6 +23,9 @@ + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" ++#ifndef FREEBSD_HAS_MEMPCPY // fix for the build failure, see bug#258092: mempcpy and wmempcpy were added in commits: ++// on 14: ee37f64cf875255338f917a9da76c643cf59786c on 2021-07-15 ++// on 13: dba677d13b26ad5422133b2ab76486b74d63ade4 on 2021-07-22 +static inline void * +mempcpy(void * restrict dst, const void * restrict src, size_t len) +{ @@ -36,6 +39,7 @@ + + return (wmemcpy(dst, src, len) + len); +} ++#endif +#pragma GCC diagnostic pop + +static inline void *