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
F132325772: D20085.id56774.diff
Wed, Oct 15, 10:20 PM
Unknown Object (File)
Tue, Oct 7, 1:10 PM
Unknown Object (File)
Tue, Oct 7, 11:57 AM
Unknown Object (File)
Sun, Sep 28, 4:07 PM
Unknown Object (File)
Sun, Sep 28, 4:01 PM
Unknown Object (File)
Sun, Sep 28, 3:58 PM
Unknown Object (File)
Sun, Sep 28, 3:52 PM
Unknown Object (File)
Sun, Sep 28, 3:48 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.