commit: c3ff582e41ebfc0a23d6a3042f2aded4db02a186 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue May 26 18:06:30 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue May 26 22:56:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ff582e
dev-lang/erlang: remove unused patches Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15976 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch | 15 -------- dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch | 45 ---------------------- 2 files changed, 60 deletions(-) diff --git a/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch b/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch deleted file mode 100644 index 84c9b81ad77..00000000000 --- a/dev-lang/erlang/files/erlang-22.1.4-asn1-dep.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/705500 -https://github.com/erlang/otp/pull/2508 - ---- a/lib/asn1/src/Makefile -+++ b/lib/asn1/src/Makefile -@@ -190,7 +190,8 @@ asn1rtt_%.$(EMULATOR): asn1rtt_%.erl - $(V_ERLC) +debug_info $< - - $(EVAL_CT_MODULES:%=%.erl): prepare_templates.$(EMULATOR) \ -- $(EBIN)/asn1ct_rtt.$(EMULATOR) -+ $(EBIN)/asn1ct_rtt.$(EMULATOR) \ -+ $(EBIN)/asn1ct_func.$(EMULATOR) - - # - # Dependencies diff --git a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch deleted file mode 100644 index 9a7d5939419..00000000000 --- a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/erlang/otp/pull/2503 - -From 9fad0c9b71808458e857cbd3871cf80f46a75af1 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <sly...@gentoo.org> -Date: Tue, 14 Jan 2020 23:15:01 +0000 -Subject: [PATCH] ei_portio.h: avoid ODR violation of - 'ei_default_socket_callbacks' - -Noticed as a build failure against fresh gcc-master: - -``` -LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here -collect2: error: ld returned 1 exit status -make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1 -``` - -The failure looks legitimate: `ei_default_socket_callbacks` is a -struct defined in 'ei_portio.h' and in 'ei_portio.c'. - -The change flips 'ei_portio.h' definition to declaration. - -Signed-off-by: Sergei Trofimovich <sly...@gentoo.org> ---- - lib/erl_interface/src/misc/ei_portio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/erl_interface/src/misc/ei_portio.h -+++ b/lib/erl_interface/src/misc/ei_portio.h -@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov - int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs); - #endif - --ei_socket_callbacks ei_default_socket_callbacks; -+extern ei_socket_callbacks ei_default_socket_callbacks; - - #define EI_FD_AS_CTX__(FD) \ - ((void *) (long) (FD)) --- -2.25.0 -
