Attachment #132179 for bug #176406

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




# $FreeBSD$

PORTNAME=	binutils
PORTVERSION=	2.24
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR=	binutils/releases

			--with-gmp=${LOCALBASE} \
			--with-mpfr=${LOCALBASE}

MAN1=		addr2line.1 \
		ar.1 \
		as.1 \
		c++filt.1 \
		gprof.1 \
		dlltool.1 \
		elfedit.1 \
		ld.1 \
		nlmconv.1 \
		nm.1 \
		objcopy.1 \
		objdump.1 \
		ranlib.1 \
		readelf.1 \
		size.1 \
		strings.1 \
		strip.1 \
		windmc.1 \
		windres.1

INFO=		as \
		binutils \
		standards \

		configure \
		ld

NO_STAGE=	yes
.include <bsd.port.options.mk>

# Actual earliest version may differ slightly


post-install:
.if ${OSVERSION} >= 900044
	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/
.endif
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \
		${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} -type d | \
		${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/binutils/distinfo (-2 / +2 lines)
1	SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097	1	SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
2	SIZE (binutils-2.23.2.tar.bz2) = 21440347	2	SIZE (binutils-2.24.tar.bz2) = 22716802





$FreeBSD$

--- bfd/Makefile.in.orig
+++ bfd/Makefile.in
@@ -336,7 +336,6 @@
 @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
-@PLUGINS_TRUE@LIBDL = -ldl
 
 # bfd.h goes here, for now
 BFD_H = bfd.h




--- gold/Makefile.in.orig	2013-11-04 16:33:39.000000000 +0100
+++ gold/Makefile.in	2013-12-13 17:15:03.279391312 +0100
@@ -419,7 +419,7 @@
 	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
+++ gold/Makefile.in
@@ -368,7 +368,6 @@
 	@INCINTL@
 
 LIBIBERTY = ../libiberty/libiberty.a
-@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
+@PLUGINS_TRUE@LIBDL = ""
 @THREADS_TRUE@THREADSLIB = -lpthread
 AM_YFLAGS = -d
 




--- ./gold/gold.h	2013-08-31 12:57:14.000000000 +0100
+++ ./gold/gold.h	2013-08-31 12:59:04.000000000 +0100
@@ -65,8 +65,27 @@
 #endif
 
 // Figure out how to get a hash set and a hash map.
+#ifdef __clang__
+#if __has_include(<unordered_set>)
+#define HAVE_CXX11_UNORDERED_SET 1
+#define HAVE_TR1_UNORDERED_SET
+#define HAVE_TR1_UNORDERED_MAP
+#endif
+#endif
+#if HAVE_CXX11_UNORDERED_SET
+
+#include <unordered_set>
+#include <unordered_map>
+
+// We need a template typedef here.
+
+#define Unordered_set std::unordered_set
+#define Unordered_map std::unordered_map
+#define Unordered_multimap std::unordered_multimap
+
+#define reserve_unordered_map(map, n) ((map)->rehash(n))
 
-#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
     && defined(HAVE_TR1_UNORDERED_MAP_REHASH)
 
 #include <tr1/unordered_set>




===================================================================
RCS file: gas/config/tc-sparc.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gas/config/tc-sparc.h	2010/10/22 12:08:29	1.31
+++ gas/config/tc-sparc.h	2013/03/26 13:49:12	1.32
@@ -33,7 +33,7 @@
 #define TARGET_ARCH bfd_arch_sparc
 
 #ifdef TE_FreeBSD
-#define ELF_TARGET_FORMAT	"elf32-sparc-freebsd"
+#define ELF_TARGET_FORMAT	"elf32-sparc"
 #define ELF64_TARGET_FORMAT	"elf64-sparc-freebsd"
 #endif
 




bin/ar
bin/as
bin/c++filt
bin/dwp
bin/elfedit
bin/gprof
bin/ld

bin/size
bin/strings
bin/strip
include/ansidecl.h
include/bfd.h
include/bfdlink.h
include/dis-asm.h

include/symcat.h
lib/libbfd.a
lib/libbfd.la
lib/libiberty.a
lib/libopcodes.a
lib/libopcodes.la
man/man1/addr2line.1.gz
man/man1/ar.1.gz
man/man1/as.1.gz
man/man1/c++filt.1.gz
man/man1/gprof.1.gz
man/man1/dlltool.1.gz
man/man1/elfedit.1.gz
man/man1/ld.1.gz
man/man1/nlmconv.1.gz
man/man1/nm.1.gz
man/man1/objcopy.1.gz
man/man1/objdump.1.gz
man/man1/ranlib.1.gz
man/man1/readelf.1.gz
man/man1/size.1.gz
man/man1/strings.1.gz
man/man1/strip.1.gz
man/man1/windmc.1.gz
man/man1/windres.1.gz
%%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo
%%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/bg/LC_MESSAGES/ld.mo

%%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/ga/LC_MESSAGES/ld.mo
%%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo
%%NLS%%share/locale/hr/LC_MESSAGES/binutils.mo
%%NLS%%share/locale/id/LC_MESSAGES/gprof.mo
%%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo
%%NLS%%share/locale/id/LC_MESSAGES/bfd.mo

Return to bug 176406

Lines 2-8 Link Here

(-)devel/binutils/Makefile (-27 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= binutils	4	PORTNAME= binutils
5	PORTVERSION= 2.23.2	5	PORTVERSION= 2.24
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= ${MASTER_SITE_SOURCEWARE}	7	MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
8	MASTER_SITE_SUBDIR= binutils/releases	8	MASTER_SITE_SUBDIR= binutils/releases
Lines 36-61 Link Here
36	--with-gmp=${LOCALBASE} \	36	--with-gmp=${LOCALBASE} \
37	--with-mpfr=${LOCALBASE}	37	--with-mpfr=${LOCALBASE}
38		38
39	MAN1= addr2line.1 \
40	ar.1 \
41	as.1 \
42	c++filt.1 \
43	gprof.1 \
44	dlltool.1 \
45	elfedit.1 \
46	ld.1 \
47	nlmconv.1 \
48	nm.1 \
49	objcopy.1 \
50	objdump.1 \
51	ranlib.1 \
52	readelf.1 \
53	size.1 \
54	strings.1 \
55	strip.1 \
56	windmc.1 \
57	windres.1
58
59	INFO= as \	39	INFO= as \
60	binutils \	40	binutils \
61	standards \	41	standards \
Lines 64-70 Link Here
64	configure \	44	configure \
65	ld	45	ld
66		46
67	NO_STAGE= yes
68	.include <bsd.port.options.mk>	47	.include <bsd.port.options.mk>
69		48
70	# Actual earliest version may differ slightly	49	# Actual earliest version may differ slightly
Lines 91-101 Link Here
91		70
92	post-install:	71	post-install:
93	.if ${OSVERSION} >= 900044	72	.if ${OSVERSION} >= 900044
94	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${PREFIX}/include/	73	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/
95	.endif	74	.endif
96	@${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} ! -type d \| \	75	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d \| \
97	${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}	76	${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
98	@${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} -type d \| \	77	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} -type d \| \
99	${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}	78	${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
100		79
101	.include <bsd.port.mk>	80	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)devel/binutils/files/patch-bfd_Makefile.in (-13 lines)
1
2	$FreeBSD$
3
4	--- bfd/Makefile.in.orig
5	+++ bfd/Makefile.in
6	@@ -336,7 +336,6 @@
7	@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
8	AM_CFLAGS = $(WARN_CFLAGS)
9	AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
10	-@PLUGINS_TRUE@LIBDL = -ldl
11
12	# bfd.h goes here, for now
13	BFD_H = bfd.h

Lines 1-12 Link Here

(-)devel/binutils/files/patch-gold_Makefile.in (-8 / +7 lines)
1		1	--- gold/Makefile.in.orig 2013-11-04 16:33:39.000000000 +0100
2	$FreeBSD$	2	+++ gold/Makefile.in 2013-12-13 17:15:03.279391312 +0100
3		3	@@ -419,7 +419,7 @@
4	--- gold/Makefile.in.orig	4	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
5	+++ gold/Makefile.in
6	@@ -368,7 +368,6 @@
7	@INCINTL@
8		5
9	LIBIBERTY = ../libiberty/libiberty.a	6	LIBIBERTY = ../libiberty/libiberty.a
10	-@PLUGINS_TRUE@LIBDL = -ldl	7	-@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
		8	+@PLUGINS_TRUE@LIBDL = ""
11	@THREADS_TRUE@THREADSLIB = -lpthread	9	@THREADS_TRUE@THREADSLIB = -lpthread
12	AM_YFLAGS = -d	10	AM_YFLAGS = -d
		11

Lines 1-31 Link Here

(-)devel/binutils/files/patch-gold_gold.h (-31 lines)
1	--- ./gold/gold.h 2013-08-31 12:57:14.000000000 +0100
2	+++ ./gold/gold.h 2013-08-31 12:59:04.000000000 +0100
3	@@ -65,8 +65,27 @@
4	#endif
5
6	// Figure out how to get a hash set and a hash map.
7	+#ifdef __clang__
8	+#if __has_include(<unordered_set>)
9	+#define HAVE_CXX11_UNORDERED_SET 1
10	+#define HAVE_TR1_UNORDERED_SET
11	+#define HAVE_TR1_UNORDERED_MAP
12	+#endif
13	+#endif
14	+#if HAVE_CXX11_UNORDERED_SET
15	+
16	+#include <unordered_set>
17	+#include <unordered_map>
18	+
19	+// We need a template typedef here.
20	+
21	+#define Unordered_set std::unordered_set
22	+#define Unordered_map std::unordered_map
23	+#define Unordered_multimap std::unordered_multimap
24	+
25	+#define reserve_unordered_map(map, n) ((map)->rehash(n))
26
27	-#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
28	+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
29	&& defined(HAVE_TR1_UNORDERED_MAP_REHASH)
30
31	#include <tr1/unordered_set>

Lines 1-16 Link Here

(-)devel/binutils/files/patch-src_gas_config_tc-sparc.h (-16 lines)
1	===================================================================
2	RCS file: gas/config/tc-sparc.h,v
3	retrieving revision 1.31
4	retrieving revision 1.32
5	diff -u -r1.31 -r1.32
6	--- gas/config/tc-sparc.h 2010/10/22 12:08:29 1.31
7	+++ gas/config/tc-sparc.h 2013/03/26 13:49:12 1.32
8	@@ -33,7 +33,7 @@
9	#define TARGET_ARCH bfd_arch_sparc
10
11	#ifdef TE_FreeBSD
12	-#define ELF_TARGET_FORMAT "elf32-sparc-freebsd"
13	+#define ELF_TARGET_FORMAT "elf32-sparc"
14	#define ELF64_TARGET_FORMAT "elf64-sparc-freebsd"
15	#endif
16

Lines 2-7 Link Here

(-)devel/binutils/pkg-plist (-2 / +21 lines)
2	bin/ar	2	bin/ar
3	bin/as	3	bin/as
4	bin/c++filt	4	bin/c++filt
		5	bin/dwp
5	bin/elfedit	6	bin/elfedit
6	bin/gprof	7	bin/gprof
7	bin/ld	8	bin/ld
Lines 15-21 Link Here
15	bin/size	16	bin/size
16	bin/strings	17	bin/strings
17	bin/strip	18	bin/strip
18	include/ansidecl.h
19	include/bfd.h	19	include/bfd.h
20	include/bfdlink.h	20	include/bfdlink.h
21	include/dis-asm.h	21	include/dis-asm.h
Lines 23-31 Link Here
23	include/symcat.h	23	include/symcat.h
24	lib/libbfd.a	24	lib/libbfd.a
25	lib/libbfd.la	25	lib/libbfd.la
26	lib/libiberty.a
27	lib/libopcodes.a	26	lib/libopcodes.a
28	lib/libopcodes.la	27	lib/libopcodes.la
		28	man/man1/addr2line.1.gz
		29	man/man1/ar.1.gz
		30	man/man1/as.1.gz
		31	man/man1/c++filt.1.gz
		32	man/man1/gprof.1.gz
		33	man/man1/dlltool.1.gz
		34	man/man1/elfedit.1.gz
		35	man/man1/ld.1.gz
		36	man/man1/nlmconv.1.gz
		37	man/man1/nm.1.gz
		38	man/man1/objcopy.1.gz
		39	man/man1/objdump.1.gz
		40	man/man1/ranlib.1.gz
		41	man/man1/readelf.1.gz
		42	man/man1/size.1.gz
		43	man/man1/strings.1.gz
		44	man/man1/strip.1.gz
		45	man/man1/windmc.1.gz
		46	man/man1/windres.1.gz
29	%%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo	47	%%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo
30	%%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo	48	%%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo
31	%%NLS%%share/locale/bg/LC_MESSAGES/ld.mo	49	%%NLS%%share/locale/bg/LC_MESSAGES/ld.mo
Lines 60-65 Link Here
60	%%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo	78	%%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo
61	%%NLS%%share/locale/ga/LC_MESSAGES/ld.mo	79	%%NLS%%share/locale/ga/LC_MESSAGES/ld.mo
62	%%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo	80	%%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo
		81	%%NLS%%share/locale/hr/LC_MESSAGES/binutils.mo
63	%%NLS%%share/locale/id/LC_MESSAGES/gprof.mo	82	%%NLS%%share/locale/id/LC_MESSAGES/gprof.mo
64	%%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo	83	%%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo
65	%%NLS%%share/locale/id/LC_MESSAGES/bfd.mo	84	%%NLS%%share/locale/id/LC_MESSAGES/bfd.mo