summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/binutils/Makefile17
-rw-r--r--devel/binutils/PLIST.common33
-rw-r--r--devel/binutils/distinfo7
-rw-r--r--devel/binutils/patches/patch-bfd_configure.ac25
-rw-r--r--devel/binutils/patches/patch-binutils_Makefile.in17
-rw-r--r--devel/binutils/patches/patch-configure12
-rw-r--r--devel/binutils/patches/patch-configure.ac9
7 files changed, 33 insertions, 87 deletions
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 597c237cbd7..96a4dbca276 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2020/05/03 13:02:18 rillig Exp $
+# $NetBSD: Makefile,v 1.82 2020/05/05 10:06:10 jperkin Exp $
DISTNAME= binutils-2.34
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=binutils/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ REPLACE_LOCALEDIR_PATTERNS+= Make-in
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_TOOLS+= gmake makeinfo
+USE_TOOLS+= gmake
# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
.include "../../mk/bsd.prefs.mk"
@@ -40,7 +40,6 @@ LIB_PATH:= /lib64:${LIB_PATH}
.endif
CONFIGURE_ARGS+= --with-lib-path=${LIB_PATH}
CONFIGURE_ARGS+= --program-prefix=g
-CONFIGURE_ENV+= ac_cv_prog_PERL= # not needed
BINUTILS_PREFIX= ${PREFIX}/${MACHINE_GNU_PLATFORM}
PLIST_SRC= ${PKGDIR}/PLIST.common
@@ -98,16 +97,6 @@ CFLAGS+= -Wno-unused-value -Wno-format-security \
CONFIGURE_ARGS+= --disable-werror
.endif
-# Prevent the need to run texi2pod.pl and pod2man which would
-# require perl as a build dependency.
-post-configure:
-.for f in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
- set -e; \
- if [ -f ${WRKSRC}/${f} ]; then \
- ${TOUCH} ${WRKSRC}/${f}; \
- fi
-.endfor
-
SYMLINK_FILES= addr2line ar as c++filt dlltool elfedit ld.bfd \
nlmconv nm objcopy objdump ranlib readelf size strings \
strip windmc windres
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index 61c14c95c77..7e22c40a189 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.30 2020/03/10 19:01:31 bacon Exp $
+@comment $NetBSD: PLIST.common,v 1.31 2020/05/05 10:06:10 jperkin Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
@@ -46,24 +46,9 @@ gnu/bin/readelf
gnu/bin/size
gnu/bin/strings
gnu/bin/strip
-gnu/man/man1/addr2line.1
-gnu/man/man1/ar.1
gnu/man/man1/as.1
-gnu/man/man1/c++filt.1
-gnu/man/man1/dlltool.1
-gnu/man/man1/elfedit.1
${PLIST.gprof}gnu/man/man1/gprof.1
${PLIST.ld}gnu/man/man1/ld.1
-gnu/man/man1/nm.1
-gnu/man/man1/objcopy.1
-gnu/man/man1/objdump.1
-gnu/man/man1/ranlib.1
-gnu/man/man1/readelf.1
-gnu/man/man1/size.1
-gnu/man/man1/strings.1
-gnu/man/man1/strip.1
-gnu/man/man1/windmc.1
-gnu/man/man1/windres.1
include/ansidecl.h
include/bfd.h
include/bfd_stdint.h
@@ -76,31 +61,15 @@ include/plugin-api.h
include/symcat.h
info/as.info
info/bfd.info
-info/binutils.info
${PLIST.gprof}info/gprof.info
info/ld.info
lib/libbfd.la
${PLIST.CTF}lib/libctf-nobfd.la
${PLIST.CTF}lib/libctf.la
lib/libopcodes.la
-man/man1/gaddr2line.1
-man/man1/gar.1
man/man1/gas.1
-man/man1/gc++filt.1
-man/man1/gdlltool.1
-man/man1/gelfedit.1
${PLIST.gprof}man/man1/ggprof.1
man/man1/gld.1
-man/man1/gnm.1
-man/man1/gobjcopy.1
-man/man1/gobjdump.1
-man/man1/granlib.1
-man/man1/greadelf.1
-man/man1/gsize.1
-man/man1/gstrings.1
-man/man1/gstrip.1
-man/man1/gwindmc.1
-man/man1/gwindres.1
share/locale/bg/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/bg/LC_MESSAGES/gprof.mo
share/locale/bg/LC_MESSAGES/ld.mo
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index d1b18407637..22d2ded5e33 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2020/02/05 06:18:34 rillig Exp $
+$NetBSD: distinfo,v 1.32 2020/05/05 10:06:10 jperkin Exp $
SHA1 (binutils-2.34.tar.bz2) = 361566c9ab5e90bd847d06f46fb9f18ec6c3ecf0
RMD160 (binutils-2.34.tar.bz2) = e99f517407503cec1042a2e824b7c1f8f0fca4b8
@@ -7,9 +7,8 @@ Size (binutils-2.34.tar.bz2) = 32430470 bytes
SHA1 (patch-bfd_cache.c) = 20988e84ff2a1d7ff83b5adb04e4f117953205b8
SHA1 (patch-bfd_config.bfd) = 4525214f9e7debd5cccaf1af55d04c1a5ff7a42d
SHA1 (patch-bfd_configure) = 37777852c63bb5b13c76f4085f1e43d50ce88920
-SHA1 (patch-bfd_configure.ac) = 742e4c118f6a00b646799862172ffa70a867cf0f
-SHA1 (patch-configure) = 0adf4ebf23385ca67b32655d23dd21204d2a4618
-SHA1 (patch-configure.ac) = b2cb10dafcabf0b743ae0c241fed2f226bc759ab
+SHA1 (patch-binutils_Makefile.in) = a24f0e6a8df05f7241198793124a0eaf9fe676d2
+SHA1 (patch-configure) = 3e518bda9d3ef169f9ebd35061b1c6374f12b406
SHA1 (patch-gas_configure.tgt) = 3a3a6fde98a457c76b70e74842ce952b0046eeda
SHA1 (patch-gold_Makefile.in) = be0ec82e1d16c6eae50153d339c8eb29aaca42d0
SHA1 (patch-gold_options.h) = ea98204c747b2d568e0f5ab7f64cc77c4341a744
diff --git a/devel/binutils/patches/patch-bfd_configure.ac b/devel/binutils/patches/patch-bfd_configure.ac
deleted file mode 100644
index 5a384f449b0..00000000000
--- a/devel/binutils/patches/patch-bfd_configure.ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bfd_configure.ac,v 1.2 2016/02/03 19:56:34 jperkin Exp $
-
-Add Bitrig/amd64 support
-https://sourceware.org/bugzilla/show_bug.cgi?id=18920
-
---- bfd/configure.ac.orig 2015-11-13 08:27:40.000000000 +0000
-+++ bfd/configure.ac
-@@ -313,7 +313,7 @@ changequote([,])dnl
- TRAD_HEADER='"hosts/i386bsd.h"'
- ;;
- changequote(,)dnl
-- i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
-+ i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd* | i[3-7]86-*-bitrig*)
- changequote([,])dnl
- COREFILE=netbsd-core.lo
- ;;
-@@ -488,7 +488,7 @@ changequote([,])dnl
- x86_64-*-linux*)
- CORE_HEADER='"hosts/x86-64linux.h"'
- ;;
-- x86_64-*-netbsd* | x86_64-*-openbsd*)
-+ x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-bitrig*)
- COREFILE=netbsd-core.lo
- ;;
- esac
diff --git a/devel/binutils/patches/patch-binutils_Makefile.in b/devel/binutils/patches/patch-binutils_Makefile.in
new file mode 100644
index 00000000000..84ee27f8f8e
--- /dev/null
+++ b/devel/binutils/patches/patch-binutils_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-binutils_Makefile.in,v 1.1 2020/05/05 10:06:10 jperkin Exp $
+
+binutils-2.34 shipped a broken tarball without pre-generated documentation,
+and we cannot depend on perl and gtexinfo to build it without serious circular
+dependency issues, so until a fixed tarball is released disable the docs.
+
+--- binutils/Makefile.in.orig 2020-05-04 17:27:24.963978676 +0000
++++ binutils/Makefile.in
+@@ -560,7 +560,7 @@ zlibdir = @zlibdir@
+ zlibinc = @zlibinc@
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign subdir-objects
+ ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+-SUBDIRS = doc po
++SUBDIRS = po
+ tooldir = $(exec_prefix)/$(target_alias)
+
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/devel/binutils/patches/patch-configure b/devel/binutils/patches/patch-configure
index de805f1199d..7594581cbae 100644
--- a/devel/binutils/patches/patch-configure
+++ b/devel/binutils/patches/patch-configure
@@ -1,9 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2020/02/05 06:18:34 rillig Exp $
+$NetBSD: patch-configure,v 1.2 2020/05/05 10:06:10 jperkin Exp $
Remove etc
---- configure.orig
+--- configure.orig 2020-01-18 14:01:13.000000000 +0000
+++ configure
-@@ -2780,1 +2780,1 @@
+@@ -2831,7 +2831,7 @@ host_libs="intl libiberty opcodes bfd re
+ # binutils, gas and ld appear in that order because it makes sense to run
+ # "make check" in that particular order.
+ # If --enable-gold is used, "gold" may replace "ld".
-host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
+host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
+
+ # these libraries are built for the target environment, and are built after
+ # the host libraries and the host tools (which may be a cross compiler)
diff --git a/devel/binutils/patches/patch-configure.ac b/devel/binutils/patches/patch-configure.ac
deleted file mode 100644
index e268b19b15a..00000000000
--- a/devel/binutils/patches/patch-configure.ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2020/02/05 06:18:34 rillig Exp $
-
-Remove etc
-
---- configure.ac.orig 2016-01-25 08:57:16.000000000 +0000
-+++ configure.ac
-@@ -143,1 +140,1 @@
--host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
-+host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 13:23:11 +0000