Paths

Table of Contentst

-
net/shadowsocks-libev/
-
shadowsocks-libev/
-
Makefile
-
files/
-
patch-git_662b6d

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.

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 23955
Build 22866: 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

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.

Harbormaster completed remote builds in B23955: Diff 56774.Apr 28 2019, 1:28 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.

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

Path

Size

net/

shadowsocks-libev/

Makefile

4 lines

files/

patch-git_662b6d

64 lines

Diff 56774

View Options

net/shadowsocks-libev/Makefile

	Show First 20 Lines • Show All 493 Lines • ▼ Show 20 Lines
	device virtio_pci # VirtIO PCI Interface			device virtio_pci # VirtIO PCI Interface
	device vtnet # VirtIO Ethernet device			device vtnet # VirtIO Ethernet device
	device virtio_blk # VirtIO Block device			device virtio_blk # VirtIO Block device
	device virtio_scsi # VirtIO SCSI device			device virtio_scsi # VirtIO SCSI device
	device virtio_balloon # VirtIO Memory Balloon device			device virtio_balloon # VirtIO Memory Balloon device
	device virtio_random # VirtIO Entropy device			device virtio_random # VirtIO Entropy device
	device virtio_console # VirtIO Console device			device virtio_console # VirtIO Console device

				# Linux KVM paravirtualization support
				device kvm_clock # KVM paravirtual clock driver

	# Microsoft Hyper-V enhancement support			# Microsoft Hyper-V enhancement support
	device hyperv # HyperV drivers			device hyperv # HyperV drivers

	# Xen HVM Guest Optimizations			# Xen HVM Guest Optimizations
	options XENHVM # Xen HVM kernel infrastructure			options XENHVM # Xen HVM kernel infrastructure
	device xenpci # Xen HVM Hypervisor services driver			device xenpci # Xen HVM Hypervisor services driver

	#####################################################################			#####################################################################
	▲ Show 20 Lines • Show All 179 Lines • Show Last 20 Lines