public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/shadowsocks-libev/, net-proxy/shadowsocks-libev/files/
Date: Mon,  1 Jun 2020 02:38:19 +0000 (UTC)	[thread overview]
Message-ID: <1590979057.2847306d107bc3dc5df5981de5295a24bd258bc0.dlan@gentoo> (raw)

commit:     2847306d107bc3dc5df5981de5295a24bd258bc0
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 02:36:55 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 02:37:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2847306d

net-proxy/shadowsocks-libev: fix gcc10 compiling error

Closes: https://bugs.gentoo.org/708380
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 .../files/shadowsocks-libev-3.3.4-gcc10.patch      | 24 ++++++++++++++++++++++
 .../shadowsocks-libev-3.3.4.ebuild                 |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch
new file mode 100644
index 00000000000..7a480f12b24
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch
@@ -0,0 +1,24 @@
+diff --git a/src/http.h b/src/http.h
+index 914815a..e312dd3 100644
+--- a/src/http.h
++++ b/src/http.h
+@@ -29,6 +29,6 @@
+ #include <stdio.h>
+ #include "protocol.h"
+ 
+-const protocol_t *const http_protocol;
++extern const protocol_t *const http_protocol;
+ 
+ #endif
+diff --git a/src/tls.h b/src/tls.h
+index 3998913..ddbee11 100644
+--- a/src/tls.h
++++ b/src/tls.h
+@@ -28,6 +28,6 @@
+ 
+ #include "protocol.h"
+ 
+-const protocol_t *const tls_protocol;
++extern const protocol_t *const tls_protocol;
+ 
+ #endif

diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
index be40495a1c0..353791fc263 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
@@ -36,6 +36,9 @@ DEPEND="${RDEPEND}
 	)
 	"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
 src_prepare() {
 	sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
 		configure.ac || die


             reply	other threads:[~2020-06-01  2:38 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-01  2:38 Yixun Lan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-27  8:23 [gentoo-commits] repo/gentoo:master commit in: net-proxy/shadowsocks-libev/, net-proxy/shadowsocks-libev/files/ Yixun Lan
2019-06-24  9:27 Yixun Lan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1590979057.2847306d107bc3dc5df5981de5295a24bd258bc0.dlan@gentoo \
    --to=dlan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox