Page MenuHomeFreeBSD

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

Authored by pkubaj on Apr 28 2019, 2:12 AM.
Tags
None
Referenced Files
F168238750: D20085.id56766.diff
Thu, Aug 27, 2:57 AM
F168187170: D20085.id57008.diff
Wed, Aug 26, 6:59 PM
F168169237: D20085.diff
Wed, Aug 26, 4:58 PM
Unknown Object (File)
Wed, Aug 26, 2:17 PM
Unknown Object (File)
Wed, Aug 26, 10:07 AM
Unknown Object (File)
Tue, Aug 25, 8:37 AM
Unknown Object (File)
Tue, Aug 25, 8:06 AM
Unknown Object (File)
Sun, Aug 23, 11:45 PM
Subscribers
None

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

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

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.

Merge patches to one file.

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.

Replace our local patch with patch from Github.

This revision is now accepted and ready to land.May 1 2019, 6:58 AM
This revision was automatically updated to reflect the committed changes.