summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2019-07-28 21:41:45 -0500
committerMatthias Maier <tamiko@gentoo.org>2019-07-28 21:43:12 -0500
commita513ac76630b5c4dfe3b37d8757665292d0be101 (patch)
treea81f293555f8a0bf4d828fbbb66c5b31351d74e9 /sys-process/criu
parentnet-libs/libnftnl: Drop unused USE flag description (diff)
downloadgentoo-a513ac76630b5c4dfe3b37d8757665292d0be101.tar.gz
gentoo-a513ac76630b5c4dfe3b37d8757665292d0be101.tar.bz2
gentoo-a513ac76630b5c4dfe3b37d8757665292d0be101.zip
sys-process/criu: fix build
Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'sys-process/criu')
-rw-r--r--sys-process/criu/criu-3.12.ebuild3
-rw-r--r--sys-process/criu/files/criu-3.12-automagic-libbsd.patch13
2 files changed, 14 insertions, 2 deletions
diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild
index 09d8af6c2b8..9001e1cf751 100644
--- a/sys-process/criu/criu-3.12.ebuild
+++ b/sys-process/criu/criu-3.12.ebuild
@@ -46,8 +46,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
- "${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
- "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
+ "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
)
criu_arch() {
diff --git a/sys-process/criu/files/criu-3.12-automagic-libbsd.patch b/sys-process/criu/files/criu-3.12-automagic-libbsd.patch
new file mode 100644
index 00000000000..7794f82e519
--- /dev/null
+++ b/sys-process/criu/files/criu-3.12-automagic-libbsd.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.config b/Makefile.config
+index a853705..27bb91f 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -2,7 +2,7 @@ include $(__nmk_dir)utils.mk
+ include $(__nmk_dir)msg.mk
+ include scripts/feature-tests.mak
+
+-ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
++ifeq ($(SETPROCTITLE)$(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),yestrue)
+ LIBS_FEATURES += -lbsd
+ FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD
+ else