FreeBSD Bugzilla – Attachment 132179 Details for
Bug 176406
[PATCH] devel/binutils: installs a file that conflict with devel/gnulibiberty
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ports.binutils.2.24.diff
ports.binutils.2.24.diff (text/x-patch), 6.65 KB, created by
Niclas Zeising
on 2013-12-13 17:09:58 UTC
(
hide
)
Description:
ports.binutils.2.24.diff
Filename:
MIME Type:
Creator:
Niclas Zeising
Created:
2013-12-13 17:09:58 UTC
Size:
6.65 KB
patch
obsolete
>Index: devel/binutils/Makefile >=================================================================== >--- devel/binutils/Makefile (revision 336105) >+++ devel/binutils/Makefile (working copy) >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= binutils >-PORTVERSION= 2.23.2 >+PORTVERSION= 2.24 > CATEGORIES= devel > MASTER_SITES= ${MASTER_SITE_SOURCEWARE} > MASTER_SITE_SUBDIR= binutils/releases >@@ -36,26 +36,6 @@ > --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 \ >@@ -64,7 +44,6 @@ > configure \ > ld > >-NO_STAGE= yes > .include <bsd.port.options.mk> > > # Actual earliest version may differ slightly >@@ -91,11 +70,11 @@ > > post-install: > .if ${OSVERSION} >= 900044 >- ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${PREFIX}/include/ >+ ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/ > .endif >- @${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} ! -type d | \ >- ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST} >- @${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} -type d | \ >- ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} >+ @${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> >Index: devel/binutils/distinfo >=================================================================== >--- devel/binutils/distinfo (revision 336105) >+++ devel/binutils/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097 >-SIZE (binutils-2.23.2.tar.bz2) = 21440347 >+SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 >+SIZE (binutils-2.24.tar.bz2) = 22716802 >Index: devel/binutils/files/patch-bfd_Makefile.in >=================================================================== >--- devel/binutils/files/patch-bfd_Makefile.in (revision 336105) >+++ devel/binutils/files/patch-bfd_Makefile.in (working copy) >@@ -1,13 +0,0 @@ >- >-$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 >Index: devel/binutils/files/patch-gold_Makefile.in >=================================================================== >--- devel/binutils/files/patch-gold_Makefile.in (revision 336105) >+++ devel/binutils/files/patch-gold_Makefile.in (working copy) >@@ -1,12 +1,11 @@ >- >-$FreeBSD$ >- >---- gold/Makefile.in.orig >-+++ gold/Makefile.in >-@@ -368,7 +368,6 @@ >- @INCINTL@ >+--- 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@ > > LIBIBERTY = ../libiberty/libiberty.a >--@PLUGINS_TRUE@LIBDL = -ldl >+-@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@ >++@PLUGINS_TRUE@LIBDL = "" > @THREADS_TRUE@THREADSLIB = -lpthread > AM_YFLAGS = -d >+ >Index: devel/binutils/files/patch-gold_gold.h >=================================================================== >--- devel/binutils/files/patch-gold_gold.h (revision 336105) >+++ devel/binutils/files/patch-gold_gold.h (working copy) >@@ -1,31 +0,0 @@ >---- ./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> >Index: devel/binutils/files/patch-src_gas_config_tc-sparc.h >=================================================================== >--- devel/binutils/files/patch-src_gas_config_tc-sparc.h (revision 336105) >+++ devel/binutils/files/patch-src_gas_config_tc-sparc.h (working copy) >@@ -1,16 +0,0 @@ >-=================================================================== >-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 >- >Index: devel/binutils/pkg-plist >=================================================================== >--- devel/binutils/pkg-plist (revision 336105) >+++ devel/binutils/pkg-plist (working copy) >@@ -2,6 +2,7 @@ > bin/ar > bin/as > bin/c++filt >+bin/dwp > bin/elfedit > bin/gprof > bin/ld >@@ -15,7 +16,6 @@ > bin/size > bin/strings > bin/strip >-include/ansidecl.h > include/bfd.h > include/bfdlink.h > include/dis-asm.h >@@ -23,9 +23,27 @@ > 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 >@@ -60,6 +78,7 @@ > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 176406
:
132178
| 132179