From owner-dev-commits-ports-all@freebsd.org Tue May 11 18:47:41 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 084AA641DE5; Tue, 11 May 2021 18:47:41 +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 4Ffn3c5bsrz4glp; Tue, 11 May 2021 18:47:40 +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 9CDE01CF79; Tue, 11 May 2021 18:47:40 +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 14BIlefi043722; Tue, 11 May 2021 18:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BIleNL043721; Tue, 11 May 2021 18:47:40 GMT (envelope-from git) Date: Tue, 11 May 2021 18:47:40 GMT Message-Id: <202105111847.14BIleNL043721@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 688422886751 - main - devel/fnccheck: fix build against updated libbfd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 688422886751cfb751c629f27f3510a3a94fee45 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: Tue, 11 May 2021 18:47:41 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=688422886751cfb751c629f27f3510a3a94fee45 commit 688422886751cfb751c629f27f3510a3a94fee45 Author: Adriaan de Groot AuthorDate: 2021-05-10 22:10:53 +0000 Commit: Adriaan de Groot CommitDate: 2021-05-11 18:47:31 +0000 devel/fnccheck: fix build against updated libbfd - use the libiberty demangling header instead of a bundled copy from 2012 that no longer compiles because of changes in ansidecl.h - if anyone knows what a CCI/Harris Tahoe was, speak up - demangle using GNU_V3 instead. --- devel/fnccheck/Makefile | 3 ++- devel/fnccheck/files/patch-src_fcdump_demangle.h | 13 +++++++++++++ devel/fnccheck/files/patch-src_fcdump_fc__dump.c | 11 +++++++++++ devel/fnccheck/files/patch-src_fcdump_fc__names.c | 11 +++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile index abce4c3ce95b..85f80e38596e 100644 --- a/devel/fnccheck/Makefile +++ b/devel/fnccheck/Makefile @@ -1,6 +1,6 @@ PORTNAME= fnccheck PORTVERSION= 3.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME} DISTNAME= FunctionCheck-${PORTVERSION} @@ -11,6 +11,7 @@ COMMENT= Profiling library/utilities for C/C++ programs LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi +BUILD_DEPENDS= gnulibiberty>=2.19.1:devel/gnulibiberty LIB_DEPENDS= libbfd.so:devel/libbfd USES= autoreconf libtool diff --git a/devel/fnccheck/files/patch-src_fcdump_demangle.h b/devel/fnccheck/files/patch-src_fcdump_demangle.h new file mode 100644 index 000000000000..7c2e56b9ba92 --- /dev/null +++ b/devel/fnccheck/files/patch-src_fcdump_demangle.h @@ -0,0 +1,13 @@ +--- src/fcdump/demangle.h.orig 2021-05-10 22:03:39 UTC ++++ src/fcdump/demangle.h +@@ -16,8 +16,9 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ ++#include + +-#if !defined (DEMANGLE_H) ++#if 0 + #define DEMANGLE_H + + #include diff --git a/devel/fnccheck/files/patch-src_fcdump_fc__dump.c b/devel/fnccheck/files/patch-src_fcdump_fc__dump.c new file mode 100644 index 000000000000..c7635681b4c4 --- /dev/null +++ b/devel/fnccheck/files/patch-src_fcdump_fc__dump.c @@ -0,0 +1,11 @@ +--- src/fcdump/fc_dump.c.orig 2021-05-10 22:05:35 UTC ++++ src/fcdump/fc_dump.c +@@ -597,7 +597,7 @@ int main(int argc, char *argv[]) + if (strcmp(argv[i], "-demangle-gnu") == 0) + {/* demangle names */ + demangle = 1; +- style = DMGL_GNU; ++ style = DMGL_GNU_V3; + } + else + if (strcmp(argv[i], "-demangle-java") == 0) diff --git a/devel/fnccheck/files/patch-src_fcdump_fc__names.c b/devel/fnccheck/files/patch-src_fcdump_fc__names.c new file mode 100644 index 000000000000..2aa44f508eeb --- /dev/null +++ b/devel/fnccheck/files/patch-src_fcdump_fc__names.c @@ -0,0 +1,11 @@ +--- src/fcdump/fc_names.c.orig 2021-05-10 22:04:48 UTC ++++ src/fcdump/fc_names.c +@@ -99,7 +99,7 @@ int fc_open_bfd_file(char *name, bfd **core_bfd, int * + switch (bfd_get_arch(*core_bfd)) + { + case bfd_arch_vax: +- case bfd_arch_tahoe: ++ /* case bfd_arch_tahoe: */ + *core_offset_to_code = 2; + break; + case bfd_arch_alpha: