mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
app-containers/docker: drop USE=hardened hacks
1. These aren't needed on hardened systems anyway (we've had default PIE
on normal, non-hardened systems for years);
2. The relevant variables are gone upstream, see
877baae03e,
which fails because of the grep sanity check in the ebuild (correctly);
3. If we did need to keep this check, we would need to do it based on a
e.g. toolchain-funcs function to check if the toolchain defaults to PIE,
but not based on USE=hardened.
Closes: https://bugs.gentoo.org/900849
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -253,14 +253,6 @@ src_compile() {
|
||||
fi
|
||||
done
|
||||
|
||||
if use hardened; then
|
||||
sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
|
||||
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
|
||||
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'
|
||||
fi
|
||||
|
||||
# build daemon
|
||||
./hack/make.sh dynbinary || die 'dynbinary failed'
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user