Page MenuHomeFreeBSD
Differential D20085

net/shadowsocks-libev: Add USES=compiler:c++11-lang and merge upstream patch (commit 662b6db3f3c395b552fa16f7fb22558aa38fe6aa) to fix build on GCC architectures.Tested on powerpc64 and amd64.PR: 237562
ClosedPublic
Actions

Authored by pkubaj on Apr 28 2019, 2:12 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Nov 29, 11:57 PM
Unknown Object (File)
Fri, Nov 29, 8:10 AM
Unknown Object (File)
Thu, Nov 28, 11:33 AM
Unknown Object (File)
Mon, Nov 25, 4:01 PM
Unknown Object (File)
Sat, Nov 23, 2:24 PM
Unknown Object (File)
Thu, Nov 21, 11:44 AM
Unknown Object (File)
Wed, Nov 20, 8:10 PM
Unknown Object (File)
Tue, Nov 12, 10:59 AM
View All Files
Subscribers
None

Details

Reviewers
linimon
tcberner
mat
Commits
rP500735: net/shadowsocks-libev: fix build with GCC-based architectures

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 23952
Build 22864: arc lint + arc unit

Event Timeline

pkubaj created this revision.Apr 28 2019, 2:12 AM
Harbormaster completed remote builds in B23952: Diff 56766.Apr 28 2019, 2:12 AM
linimon retitled this revision from Add USES=compiler:c++11-lang and merge upstream patch (commit 662b6db3f3c395b552fa16f7fb22558aa38fe6aa) to fix build on GCC architectures. Tested on powerpc64 and amd64. PR: 237562 to net/shadowsocks-libev: Add USES=compiler:c++11-lang and merge upstream patch (commit 662b6db3f3c395b552fa16f7fb22558aa38fe6aa) to fix build on GCC architectures.Tested on powerpc64 and amd64.PR: 237562.Apr 28 2019, 2:29 AM
tcberner added a comment.Apr 28 2019, 7:52 AM

I would try to add the upstream commit as patch, and call it patch-git_662b6d -- that way it is clear that it comes from upstream and can probably go in the next upgrade.

Also I would keep the whole header of the commit in there.

pkubaj updated this revision to Diff 56774.Apr 28 2019, 1:28 PM

Merge patches to one file.

Harbormaster completed remote builds in B23955: Diff 56774.Apr 28 2019, 1:28 PM
mat added a comment.Apr 30 2019, 2:08 PM

If this is a verbatim upstream patch, you could simply add a patch block:

PATCH_SITES=    https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES=     662b6db3f3c395b552fa16f7fb22558aa38fe6aa.patch:-p1 \

and run make makesum again.

pkubaj updated this revision to Diff 56877.Apr 30 2019, 7:07 PM

Replace our local patch with patch from Github.

Harbormaster completed remote builds in B24017: Diff 56877.Apr 30 2019, 7:07 PM
mat accepted this revision.May 1 2019, 6:58 AM
This revision is now accepted and ready to land.May 1 2019, 6:58 AM
Closed by commit rP500735: net/shadowsocks-libev: fix build with GCC-based architectures (authored by pkubaj). · Explain WhyMay 3 2019, 2:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
net/
shadowsocks-libev/
4 lines
files/
38 lines
11 lines
11 lines

Diff 56766

View Options

net/shadowsocks-libev/Makefile

Loading...
View Options

net/shadowsocks-libev/files/patch-src_manager.c

Loading...
View Options

net/shadowsocks-libev/files/patch-src_netutils.c

Loading...
View Options

net/shadowsocks-libev/files/patch-src_server.c

Loading...