diff options
| author |   William Hubbs <williamh@gentoo.org> | 2016-07-28 10:45:33 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2016-07-28 10:45:33 -0500 |
| commit | 01209e75c466880f12ca47cb6a3bd8d73a51f849 (patch) | |
| tree | aa4ab21eb36cf6e9a90c115b3814002c14fdbd48 | |
| parent | app-emulation/docker: remove old (diff) | |
| download | gentoo-01209e75.tar.gz gentoo-01209e75.tar.bz2 gentoo-01209e75.zip | |
app-emulation/docker: sync live ebuild
Package-Manager: portage-2.2.28
| -rw-r--r-- | app-emulation/docker/docker-9999.ebuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index c4c359b91e35..9f78ea58ede9 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.ebuild @@ -73,9 +73,11 @@ CONFIG_CHECK=" ~DEVPTS_MULTIPLE_INSTANCES ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~IP_VS + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE + ~IP_VS ~IP_VS_RR ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK + ~NETFILTER_XT_MATCH_IVPS + ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT ~NF_NAT ~NF_NAT_NEEDED ~POSIX_MQUEUE @@ -194,8 +196,11 @@ src_compile() { grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ - -i hack/make/dynbinary || die - grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' + -i hack/make/dynbinary-client || die + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' fi # let's set up some optional features :) |