Hi,

I was updating aarch64 and arm gcc+binutils based on devel/riscv-elf,
but as it turns out that there are some files that are not per cross-
compiler target, but somehow installed for all (and hence clashing
with arm/aarch64).

I'd propose disabling it.  The info ones are disabled like the other
ones, and libdep.a doesn't seem to be used by the build.

ok?

Patrick

diff --git a/devel/riscv-elf/binutils/Makefile 
b/devel/riscv-elf/binutils/Makefile
index f0b711c4eb6..c3d18f5cfc5 100644
--- a/devel/riscv-elf/binutils/Makefile
+++ b/devel/riscv-elf/binutils/Makefile
@@ -1,7 +1,7 @@
 COMMENT=       binutils for riscv-elf cross-development
 
 V=             2.40
-REVISION=      0
+REVISION=      1
 DISTNAME=      binutils-${V}
 
 HOMEPAGE=      https://www.gnu.org/software/binutils/
diff --git a/devel/riscv-elf/binutils/patches/patch-ld_Makefile_in 
b/devel/riscv-elf/binutils/patches/patch-ld_Makefile_in
index a4d808180c7..b121dc3e435 100644
--- a/devel/riscv-elf/binutils/patches/patch-ld_Makefile_in
+++ b/devel/riscv-elf/binutils/patches/patch-ld_Makefile_in
@@ -10,3 +10,12 @@ Index: ld/Makefile.in
  am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
  DVIS = ld.dvi
  PDFS = ld.pdf
+@@ -1042,7 +1042,7 @@ libldtestplug4_la_SOURCES = testplug4.c
+ libldtestplug4_la_CFLAGS = -g -O2
+ libldtestplug4_la_LDFLAGS = -no-undefined -rpath /nowhere
+ bfdplugindir = $(libdir)/bfd-plugins
+-bfdplugin_LTLIBRARIES = libdep.la
++bfdplugin_LTLIBRARIES =
+ libdep_la_SOURCES = libdep_plugin.c
+ libdep_la_LDFLAGS = -no-undefined -rpath /nowhere -module -avoid-version
+ libdep_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
diff --git a/devel/riscv-elf/binutils/patches/patch-libctf_Makefile_in 
b/devel/riscv-elf/binutils/patches/patch-libctf_Makefile_in
new file mode 100644
index 00000000000..3740dbfedc7
--- /dev/null
+++ b/devel/riscv-elf/binutils/patches/patch-libctf_Makefile_in
@@ -0,0 +1,12 @@
+Index: libctf/Makefile.in
+--- libctf/Makefile.in.orig
++++ libctf/Makefile.in
+@@ -306,7 +306,7 @@ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+ am__dirstamp = $(am__leading_dot)dirstamp
+-INFO_DEPS = doc/ctf-spec.info
++INFO_DEPS =
+ am__TEXINFO_TEX_DIR = $(srcdir)
+ DVIS = doc/ctf-spec.dvi
+ PDFS = doc/ctf-spec.pdf
diff --git a/devel/riscv-elf/binutils/patches/patch-libsframe_Makefile_in 
b/devel/riscv-elf/binutils/patches/patch-libsframe_Makefile_in
new file mode 100644
index 00000000000..48a35044a59
--- /dev/null
+++ b/devel/riscv-elf/binutils/patches/patch-libsframe_Makefile_in
@@ -0,0 +1,12 @@
+Index: libsframe/Makefile.in
+--- libsframe/Makefile.in.orig
++++ libsframe/Makefile.in
+@@ -276,7 +276,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+-INFO_DEPS = doc/sframe-spec.info
++INFO_DEPS =
+ am__TEXINFO_TEX_DIR = $(srcdir)
+ DVIS = doc/sframe-spec.dvi
+ PDFS = doc/sframe-spec.pdf
diff --git a/devel/riscv-elf/binutils/pkg/PLIST 
b/devel/riscv-elf/binutils/pkg/PLIST
index bfdfc295a3b..e726af29ebb 100644
--- a/devel/riscv-elf/binutils/pkg/PLIST
+++ b/devel/riscv-elf/binutils/pkg/PLIST
@@ -14,10 +14,6 @@
 @bin bin/${CONFIG}-size
 @bin bin/${CONFIG}-strings
 @bin bin/${CONFIG}-strip
-@info info/ctf-spec.info
-@info info/sframe-spec.info
-lib/bfd-plugins/
-@static-lib lib/bfd-plugins/libdep.a
 @man man/man1/${CONFIG}-addr2line.1
 @man man/man1/${CONFIG}-ar.1
 @man man/man1/${CONFIG}-as.1

Reply via email to