Attachment #224852 for bug #255794

View | Details | Raw Unified | Return to bug 255794
Collapse All | Expand All

Lines 1-6 Link Here

(-)devel/fnccheck/Makefile (-1 / +2 lines)
1	PORTNAME= fnccheck	1	PORTNAME= fnccheck
2	PORTVERSION= 3.2.0	2	PORTVERSION= 3.2.0
3	PORTREVISION= 4	3	PORTREVISION= 5
4	CATEGORIES= devel	4	CATEGORIES= devel
5	MASTER_SITES= SF/${PORTNAME}	5	MASTER_SITES= SF/${PORTNAME}
6	DISTNAME= FunctionCheck-${PORTVERSION}	6	DISTNAME= FunctionCheck-${PORTVERSION}
Lines 11-16 COMMENT= Profiling library/utilities for C/C++ programs Link Here
11	LICENSE= GPLv2 LGPL21	11	LICENSE= GPLv2 LGPL21
12	LICENSE_COMB= multi	12	LICENSE_COMB= multi
13		13
		14	BUILD_DEPENDS= gnulibiberty>=2.19.1:devel/gnulibiberty
14	LIB_DEPENDS= libbfd.so:devel/libbfd	15	LIB_DEPENDS= libbfd.so:devel/libbfd
15		16
16	USES= autoreconf libtool	17	USES= autoreconf libtool




--- 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 <libiberty/demangle.h>
 
-#if !defined (DEMANGLE_H)
+#if 0
 #define DEMANGLE_H
 
 #include <ansidecl.h>

Added Link Here

(-)devel/fnccheck/files/patch-src_fcdump_fc__dump.c (+11 lines)
1	--- src/fcdump/fc_dump.c.orig 2021-05-10 22:05:35 UTC
2	+++ src/fcdump/fc_dump.c
3	@@ -597,7 +597,7 @@ int main(int argc, char *argv[])
4	if (strcmp(argv[i], "-demangle-gnu") == 0)
5	{/* demangle names */
6	demangle = 1;
7	- style = DMGL_GNU;
8	+ style = DMGL_GNU_V3;
9	}
10	else
11	if (strcmp(argv[i], "-demangle-java") == 0)

Added Link Here

(-)devel/fnccheck/files/patch-src_fcdump_fc__names.c (+11 lines)
1	--- src/fcdump/fc_names.c.orig 2021-05-10 22:04:48 UTC
2	+++ src/fcdump/fc_names.c
3	@@ -99,7 +99,7 @@ int fc_open_bfd_file(char name, bfd core_bfd, int
4	switch (bfd_get_arch(*core_bfd))
5	{
6	case bfd_arch_vax:
7	- case bfd_arch_tahoe:
8	+ /* case bfd_arch_tahoe: */
9	*core_offset_to_code = 2;
10	break;
11	case bfd_arch_alpha:




# Created by: Joerg Wunsch <joerg@FreeBSD.org>

PORTNAME=	gnulibiberty
PORTVERSION=	2.33.1
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	SOURCEWARE/binutils/releases
DISTNAME=	binutils-${PORTVERSION}


WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/libiberty

USES=		gmake tar:xz

CONFIGURE_ARGS=	--enable-install-libiberty
GNU_CONFIGURE=	yes

CONFLICTS=	freelibiberty-[0-9]*

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/gnulibiberty/distinfo (-2 / +3 lines)
1	SHA256 (binutils-2.19.1.tar.bz2) = 3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6	1	TIMESTAMP = 1575361927
2	SIZE (binutils-2.19.1.tar.bz2) = 16245771	2	SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
		3	SIZE (binutils-2.33.1.tar.xz) = 21490848




--- Makefile.in.orig	Thu Jul 24 15:51:49 2008
+++ Makefile.in	Mon Apr  6 09:05:19 2009
@@ -348,11 +348,15 @@
 INSTALL_DEST = @INSTALL_DEST@
 install: install_to_$(INSTALL_DEST) install-subdir
 
+## FreeBSD port removed this: otherwise, FreeBSD 6.x would end up installing
+## in ${prefix}/lib/elf rather than ${prefix}/lib
+##
 # This is tricky.  Even though CC in the Makefile contains
 # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
 # default multilib, so we have to take LIBCFLAGS into account as well,
 # since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
+##MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
+MULTIOSDIR = .
 install_to_libdir: all
 	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
 	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n




--- configure.orig	Fri Apr  7 02:01:25 2006
+++ configure	Tue Oct 10 13:00:57 2006
@@ -5679,6 +5679,14 @@
 
   fi
 
+
+else
+
+   # Not a target library, so we set things up to run the test suite.
+   CHECK=really-check
+
+fi
+
   # We may wish to install the target headers somewhere.
   # Check whether --enable-install-libiberty or --disable-install-libiberty was given.
 if test "${enable_install_libiberty+set}" = set; then
@@ -5701,13 +5709,6 @@
       ;;
   esac
 
-
-else
-
-   # Not a target library, so we set things up to run the test suite.
-   CHECK=really-check
-
-fi
 
 
 

Lines 10-13 include/libiberty/partition.h Link Here

(-)devel/gnulibiberty/pkg-plist (+1 lines)
10	include/libiberty/safe-ctype.h	10	include/libiberty/safe-ctype.h
11	include/libiberty/sort.h	11	include/libiberty/sort.h
12	include/libiberty/splay-tree.h	12	include/libiberty/splay-tree.h
		13	include/libiberty/timeval-utils.h
13	lib/libiberty.a	14	lib/libiberty.a

Lines 1-8 Link Here

(-)devel/libbfd/Makefile (-3 / +2 lines)
1	# Created by: Joerg Wunsch <joerg@FreeBSD.org>	1	# Created by: Joerg Wunsch <joerg@FreeBSD.org>
2		2
3	PORTNAME= libbfd	3	PORTNAME= libbfd
4	PORTVERSION= 2.19.1	4	PORTVERSION= 2.33.1
5	PORTREVISION= 3
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= SOURCEWARE/binutils/releases	6	MASTER_SITES= SOURCEWARE/binutils/releases
8	DISTNAME= binutils-${PORTVERSION}	7	DISTNAME= binutils-${PORTVERSION}
Lines 20-26 CONFLICTS= mingw-binutils-[0-9]* binutils-[0-9]* Link Here
20		19
21	WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/bfd	20	WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/bfd
22		21
23	USES= libtool tar:bzip2	22	USES= libtool tar:xz
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= --enable-install-libbfd \	24	CONFIGURE_ARGS= --enable-install-libbfd \
26	--disable-nls \	25	--disable-nls \

Lines 1-2 Link Here

(-)devel/libbfd/distinfo (-2 / +3 lines)
1	SHA256 (binutils-2.19.1.tar.bz2) = 3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6	1	TIMESTAMP = 1575361927
2	SIZE (binutils-2.19.1.tar.bz2) = 16245771	2	SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
		3	SIZE (binutils-2.33.1.tar.xz) = 21490848

Removed Link Here

(-)devel/libbfd/files/patch-configure (-11 lines)
1	--- configure.orig
2	+++ configure
3	@@ -19503,7 +19503,7 @@ case "${host}" in
4	WIN32LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
5	fi
6	;;
7	---linux*)
8	+*)
9	# We borrow WIN32LIBADD so that the shared libbfd won't depend on
10	# libiberty.a.
11	x=`sed -n -e 's/^[ ]PICFLAG[ ]=[ ]*//p' < ../libiberty/Makefile \| sed -n '$p'`

Lines 1-7 Link Here

(-)devel/libbfd/pkg-plist (-1 / +4 lines)
1	include/ansidecl.h	1	include/ansidecl.h
2	include/bfd.h	2	include/bfd.h
3	include/bfdlink.h	3	include/bfdlink.h
		4	include/bfd_stdint.h
		5	include/diagnostics.h
		6	include/plugin-api.h
4	include/symcat.h	7	include/symcat.h
5	lib/libbfd-2.19.1.so	8	lib/libbfd-2.33.1.so
6	lib/libbfd.a	9	lib/libbfd.a
7	lib/libbfd.so	10	lib/libbfd.so

Return to bug 255794

Added Link Here

(-)devel/fnccheck/files/patch-src_fcdump_demangle.h (+13 lines)
1	--- src/fcdump/demangle.h.orig 2021-05-10 22:03:39 UTC
2	+++ src/fcdump/demangle.h
3	@@ -16,8 +16,9 @@
4	along with this program; if not, write to the Free Software
5	Foundation, Inc., 59 Temple Place - Suite 330,
6	Boston, MA 02111-1307, USA. */
7	+#include <libiberty/demangle.h>
8
9	-#if !defined (DEMANGLE_H)
10	+#if 0
11	#define DEMANGLE_H
12
13	#include <ansidecl.h>

Lines 1-8 Link Here

(-)devel/gnulibiberty/Makefile (-5 / +2 lines)
1	# Created by: Joerg Wunsch <joerg@FreeBSD.org>	1	# Created by: Joerg Wunsch <joerg@FreeBSD.org>
2		2
3	PORTNAME= gnulibiberty	3	PORTNAME= gnulibiberty
4	PORTVERSION= 2.19.1	4	PORTVERSION= 2.33.1
5	PORTREVISION= 2
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= SOURCEWARE/binutils/releases	6	MASTER_SITES= SOURCEWARE/binutils/releases
8	DISTNAME= binutils-${PORTVERSION}	7	DISTNAME= binutils-${PORTVERSION}
Lines 12-22 COMMENT= Miscellaneous GNU functions Link Here
12		11
13	WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/libiberty	12	WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/libiberty
14		13
15	USES= gmake tar:bzip2	14	USES= gmake tar:xz
16		15
17	CONFIGURE_ARGS= --enable-install-libiberty	16	CONFIGURE_ARGS= --enable-install-libiberty
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19		18
20	CONFLICTS= freelibiberty-[0-9]*
21
22	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Removed Link Here

(-)devel/gnulibiberty/files/patch-Makefile.in (-19 lines)
1	--- Makefile.in.orig Thu Jul 24 15:51:49 2008
2	+++ Makefile.in Mon Apr 6 09:05:19 2009
3	@@ -348,11 +348,15 @@
4	INSTALL_DEST = @INSTALL_DEST@
5	install: install_to_$(INSTALL_DEST) install-subdir
6
7	+## FreeBSD port removed this: otherwise, FreeBSD 6.x would end up installing
8	+## in ${prefix}/lib/elf rather than ${prefix}/lib
9	+##
10	# This is tricky. Even though CC in the Makefile contains
11	# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
12	# default multilib, so we have to take LIBCFLAGS into account as well,
13	# since it will be passed the multilib flags.
14	-MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
15	+##MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
16	+MULTIOSDIR = .
17	install_to_libdir: all
18	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
19	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n

Removed Link Here

(-)devel/gnulibiberty/files/patch-configure (-31 lines)
1	--- configure.orig Fri Apr 7 02:01:25 2006
2	+++ configure Tue Oct 10 13:00:57 2006
3	@@ -5679,6 +5679,14 @@
4
5	fi
6
7	+
8	+else
9	+
10	+ # Not a target library, so we set things up to run the test suite.
11	+ CHECK=really-check
12	+
13	+fi
14	+
15	# We may wish to install the target headers somewhere.
16	# Check whether --enable-install-libiberty or --disable-install-libiberty was given.
17	if test "${enable_install_libiberty+set}" = set; then
18	@@ -5701,13 +5709,6 @@
19	;;
20	esac
21
22	-
23	-else
24	-
25	- # Not a target library, so we set things up to run the test suite.
26	- CHECK=really-check
27	-
28	-fi
29
30
31