| 1 |
commit: d72db90cfb69be1008d0b810d910b1110d7e85dc |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 26 06:36:06 2016 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 26 06:36:17 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72db90c |
| 7 |
|
| 8 |
sys-process/criu: drop old |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
sys-process/criu/Manifest | 2 - |
| 13 |
sys-process/criu/criu-1.8.ebuild | 72 ----------------- |
| 14 |
sys-process/criu/criu-2.1.ebuild | 93 ---------------------- |
| 15 |
sys-process/criu/files/2.0/criu-2.0-flags.patch | 13 --- |
| 16 |
sys-process/criu/files/2.1/criu-2.1-makefile.patch | 75 ----------------- |
| 17 |
sys-process/criu/files/criu-1.3.1-flags.patch | 55 ------------- |
| 18 |
.../criu/files/criu-1.7-automagic-libbsd.patch | 29 ------- |
| 19 |
sys-process/criu/files/criu-1.8-makefile.patch | 25 ------ |
| 20 |
8 files changed, 364 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest |
| 23 |
index 23ee5a1..0066ee7 100644 |
| 24 |
--- a/sys-process/criu/Manifest |
| 25 |
+++ b/sys-process/criu/Manifest |
| 26 |
@@ -1,5 +1,3 @@ |
| 27 |
-DIST criu-1.8.tar.bz2 534200 SHA256 d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb SHA512 de3f63613124606be08e5323f465c63811c35c457f4b1a311434aeb02590ebf652845b727b9e10b8a9eb9402c97e772ff044135bec7797cc6e4ad972efc9172d WHIRLPOOL 2f2d18f5fbd1608acfd6ce9e1283cf05a1574b2a141cd4cf29bcacc370ed0bfce488187e40250edeb396daf8fc38f2a2e960ffd8773511a82eebce3a74663e9f |
| 28 |
-DIST criu-2.1.tar.bz2 556820 SHA256 7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4 SHA512 19fd57464a757a3b668ebf5ba70ea80d591d0df70a325ad5929408239f3439ef1cabe68367c778e386e5b818adf4fc4b98dccf729d2b5d656f12389e3f6d9439 WHIRLPOOL 4c193d96ff83ec08e8cb2de1ea1a2b11ceb6980d64cfc71bb2f9e1b518aa7b15ab7a2838fb2559aaa82c1e72378c5d0c5175bb437fff1040d0e95a60e5c8525c |
| 29 |
DIST criu-2.2.tar.bz2 558926 SHA256 f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53 SHA512 3e03dcd3531641e93f88354515b902390a9d83fd79eec36848ded5a28e987cd5ae8e81d7ed645960a86f4dfa5176f17de02f5a9b19723a8aaa2bf15057fe46dd WHIRLPOOL 62bf41089f0028926622ba69c5c6f44f0ee8288a38b2d6ce82e9c727c9ee9ccd1f65a6a8654c9faa06597316e8b00b6076b4cddf6d7af06b85f8de334de9afa7 |
| 30 |
DIST criu-2.3.tar.bz2 572580 SHA256 acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe SHA512 b058d4a917363190f5196256ecff23fab7c11e259807d8cef954690e9bc03751095529da5774e687ff6a1a506382aec92275771b031d790d6a0bd7cebde2916a WHIRLPOOL a32809d05d01781b3241f4c6766f8d17acc8de275af01d934e849a47f8857d4479147dc127cc02e32ebb6358720536e1596b6e063fdc88ee1c0b0725e126220f |
| 31 |
DIST criu-2.4.tar.bz2 602896 SHA256 2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0 SHA512 04f1ba472ea9189250f1eedbf377b2607f8425cc660b37e1ca8b47310eec84331551f5c3db1b7341779176aaeaaab67662545dad2ffbcf212548c67a991b0c72 WHIRLPOOL 9447a3e542beced07636269c7c6612080ecd6d4edb2bb09459440fc8a517bb08dd385bde6c80d5cc61dbf90948b740aa80bdae6bcd79b8415ae3d4fdec4413cd |
| 32 |
|
| 33 |
diff --git a/sys-process/criu/criu-1.8.ebuild b/sys-process/criu/criu-1.8.ebuild |
| 34 |
deleted file mode 100644 |
| 35 |
index 120c6da..0000000 |
| 36 |
--- a/sys-process/criu/criu-1.8.ebuild |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,72 +0,0 @@ |
| 39 |
-# Copyright 1999-2015 Gentoo Foundation |
| 40 |
-# Distributed under the terms of the GNU General Public License v2 |
| 41 |
-# $Id$ |
| 42 |
- |
| 43 |
-EAPI=5 |
| 44 |
- |
| 45 |
-inherit eutils toolchain-funcs linux-info flag-o-matic |
| 46 |
- |
| 47 |
-DESCRIPTION="utility to checkpoint/restore a process tree" |
| 48 |
-HOMEPAGE="http://criu.org/" |
| 49 |
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" |
| 50 |
- |
| 51 |
-LICENSE="GPL-2" |
| 52 |
-SLOT="0" |
| 53 |
-KEYWORDS="~amd64 ~arm ~arm64" |
| 54 |
-IUSE="setproctitle" |
| 55 |
- |
| 56 |
-RDEPEND="dev-libs/protobuf-c |
| 57 |
- setproctitle? ( dev-libs/libbsd )" |
| 58 |
-DEPEND="${RDEPEND} |
| 59 |
- app-text/asciidoc |
| 60 |
- app-text/xmlto" |
| 61 |
- |
| 62 |
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |
| 63 |
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" |
| 64 |
- |
| 65 |
-RESTRICT="test" |
| 66 |
- |
| 67 |
-src_prepare() { |
| 68 |
- epatch "${FILESDIR}"/${PN}-1.3.1-flags.patch |
| 69 |
- epatch "${FILESDIR}"/${PN}-1.8-makefile.patch |
| 70 |
- epatch "${FILESDIR}"/${PN}-1.7-automagic-libbsd.patch |
| 71 |
-} |
| 72 |
- |
| 73 |
-criu_arch() { |
| 74 |
- # criu infers the arch from $(uname -m). We never want this to happen. |
| 75 |
- case ${ARCH} in |
| 76 |
- amd64) echo "x86_64";; |
| 77 |
- arm64) echo "aarch64";; |
| 78 |
- x86) echo "i386";; |
| 79 |
- *) echo "${ARCH}";; |
| 80 |
- esac |
| 81 |
-} |
| 82 |
- |
| 83 |
-src_compile() { |
| 84 |
- emake \ |
| 85 |
- CC="$(tc-getCC)" \ |
| 86 |
- LD="$(tc-getLD)" \ |
| 87 |
- OBJCOPY="$(tc-getOBJCOPY)" \ |
| 88 |
- ARCH="$(criu_arch)" \ |
| 89 |
- V=1 WERROR=0 \ |
| 90 |
- SETPROCTITLE=$(usex setproctitle) \ |
| 91 |
- all docs |
| 92 |
-} |
| 93 |
- |
| 94 |
-src_test() { |
| 95 |
- # root privileges are required to dump all necessary info |
| 96 |
- if [[ ${EUID} -eq 0 ]] ; then |
| 97 |
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test |
| 98 |
- fi |
| 99 |
-} |
| 100 |
- |
| 101 |
-src_install() { |
| 102 |
- emake \ |
| 103 |
- ARCH="$(criu_arch)" \ |
| 104 |
- PREFIX="${EPREFIX}"/usr \ |
| 105 |
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ |
| 106 |
- DESTDIR="${D}" \ |
| 107 |
- install |
| 108 |
- |
| 109 |
- dodoc CREDITS README.md |
| 110 |
-} |
| 111 |
|
| 112 |
diff --git a/sys-process/criu/criu-2.1.ebuild b/sys-process/criu/criu-2.1.ebuild |
| 113 |
deleted file mode 100644 |
| 114 |
index 40e9317..0000000 |
| 115 |
--- a/sys-process/criu/criu-2.1.ebuild |
| 116 |
+++ /dev/null |
| 117 |
@@ -1,93 +0,0 @@ |
| 118 |
-# Copyright 1999-2016 Gentoo Foundation |
| 119 |
-# Distributed under the terms of the GNU General Public License v2 |
| 120 |
-# $Id$ |
| 121 |
- |
| 122 |
-EAPI=5 |
| 123 |
- |
| 124 |
-PYTHON_COMPAT=( python2_7 ) |
| 125 |
- |
| 126 |
-inherit eutils toolchain-funcs linux-info flag-o-matic python-r1 python-utils-r1 |
| 127 |
- |
| 128 |
-DESCRIPTION="utility to checkpoint/restore a process tree" |
| 129 |
-HOMEPAGE="http://criu.org/" |
| 130 |
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2" |
| 131 |
- |
| 132 |
-LICENSE="GPL-2" |
| 133 |
-SLOT="0" |
| 134 |
-KEYWORDS="~amd64 ~arm ~arm64" |
| 135 |
-IUSE="python setproctitle" |
| 136 |
- |
| 137 |
-RDEPEND="dev-libs/protobuf-c |
| 138 |
- dev-libs/libnl:3 |
| 139 |
- python? ( ${PYTHON_DEPS} ) |
| 140 |
- setproctitle? ( dev-libs/libbsd )" |
| 141 |
-DEPEND="${RDEPEND} |
| 142 |
- app-text/asciidoc |
| 143 |
- app-text/xmlto" |
| 144 |
-RDEPEND="${RDEPEND} |
| 145 |
- python? ( |
| 146 |
- dev-libs/protobuf[python,${PYTHON_USEDEP}] |
| 147 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
| 148 |
- )" |
| 149 |
- |
| 150 |
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |
| 151 |
- ~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG" |
| 152 |
- |
| 153 |
-RESTRICT="test" |
| 154 |
- |
| 155 |
-src_prepare() { |
| 156 |
- epatch "${FILESDIR}"/2.0/${PN}-2.0-flags.patch |
| 157 |
- epatch "${FILESDIR}"/${PV}/${P}-makefile.patch |
| 158 |
- epatch "${FILESDIR}"/2.0/${PN}-2.0-automagic-libbsd.patch |
| 159 |
- epatch "${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch |
| 160 |
-} |
| 161 |
- |
| 162 |
-criu_arch() { |
| 163 |
- # criu infers the arch from $(uname -m). We never want this to happen. |
| 164 |
- case ${ARCH} in |
| 165 |
- amd64) echo "x86";; |
| 166 |
- arm64) echo "aarch64";; |
| 167 |
- *) echo "${ARCH}";; |
| 168 |
- esac |
| 169 |
-} |
| 170 |
- |
| 171 |
-src_compile() { |
| 172 |
- RAW_LDFLAGS="$(raw-ldflags)" emake \ |
| 173 |
- CC="$(tc-getCC)" \ |
| 174 |
- LD="$(tc-getLD)" \ |
| 175 |
- OBJCOPY="$(tc-getOBJCOPY)" \ |
| 176 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 177 |
- ARCH="$(criu_arch)" \ |
| 178 |
- V=1 WERROR=0 DEBUG=0 \ |
| 179 |
- SETPROCTITLE=$(usex setproctitle) \ |
| 180 |
- PYCRIU=$(usex python) \ |
| 181 |
- all docs |
| 182 |
-} |
| 183 |
- |
| 184 |
-src_test() { |
| 185 |
- # root privileges are required to dump all necessary info |
| 186 |
- if [[ ${EUID} -eq 0 ]] ; then |
| 187 |
- emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test |
| 188 |
- fi |
| 189 |
-} |
| 190 |
- |
| 191 |
-install_crit() { |
| 192 |
- "${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" |
| 193 |
-} |
| 194 |
- |
| 195 |
-src_install() { |
| 196 |
- emake \ |
| 197 |
- ARCH="$(criu_arch)" \ |
| 198 |
- PREFIX="${EPREFIX}"/usr \ |
| 199 |
- LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ |
| 200 |
- DESTDIR="${D}" \ |
| 201 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 202 |
- install |
| 203 |
- |
| 204 |
- dodoc CREDITS README.md |
| 205 |
- |
| 206 |
- if use python ; then |
| 207 |
- cd lib |
| 208 |
- python_foreach_impl install_crit |
| 209 |
- fi |
| 210 |
-} |
| 211 |
|
| 212 |
diff --git a/sys-process/criu/files/2.0/criu-2.0-flags.patch b/sys-process/criu/files/2.0/criu-2.0-flags.patch |
| 213 |
deleted file mode 100644 |
| 214 |
index c57573e..0000000 |
| 215 |
--- a/sys-process/criu/files/2.0/criu-2.0-flags.patch |
| 216 |
+++ /dev/null |
| 217 |
@@ -1,13 +0,0 @@ |
| 218 |
-diff --git a/Makefile b/Makefile |
| 219 |
-index 7569387..eec3be4 100644 |
| 220 |
---- a/Makefile |
| 221 |
-+++ b/Makefile |
| 222 |
-@@ -97,8 +97,6 @@ endif |
| 223 |
- ifeq ($(DEBUG),1) |
| 224 |
- DEFINES += -DCR_DEBUG |
| 225 |
- CFLAGS += -O0 -ggdb3 |
| 226 |
--else |
| 227 |
-- CFLAGS += -O2 -g |
| 228 |
- endif |
| 229 |
- |
| 230 |
- CFLAGS += $(WARNINGS) $(DEFINES) |
| 231 |
|
| 232 |
diff --git a/sys-process/criu/files/2.1/criu-2.1-makefile.patch b/sys-process/criu/files/2.1/criu-2.1-makefile.patch |
| 233 |
deleted file mode 100644 |
| 234 |
index fb31639..0000000 |
| 235 |
--- a/sys-process/criu/files/2.1/criu-2.1-makefile.patch |
| 236 |
+++ /dev/null |
| 237 |
@@ -1,75 +0,0 @@ |
| 238 |
-diff --git a/Makefile.install b/Makefile.install |
| 239 |
-index 6fcf25e..103373b 100644 |
| 240 |
---- a/Makefile.install |
| 241 |
-+++ b/Makefile.install |
| 242 |
-@@ -5,23 +5,10 @@ PREFIX ?= /usr/local |
| 243 |
- SBINDIR ?= $(PREFIX)/sbin |
| 244 |
- MANDIR ?= $(PREFIX)/share/man |
| 245 |
- SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ |
| 246 |
--LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ |
| 247 |
-+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ |
| 248 |
- LIBDIR ?= $(PREFIX)/lib |
| 249 |
- INCLUDEDIR ?= $(PREFIX)/include/criu |
| 250 |
- |
| 251 |
--# |
| 252 |
--# For recent Debian/Ubuntu with multiarch support. |
| 253 |
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
| 254 |
--ifneq "$(DEB_HOST_MULTIARCH)" "" |
| 255 |
-- LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
| 256 |
--else |
| 257 |
-- # |
| 258 |
-- # For most other systems |
| 259 |
-- ifeq "$(shell uname -m)" "x86_64" |
| 260 |
-- LIBDIR ?= $(PREFIX)/lib64 |
| 261 |
-- endif |
| 262 |
--endif |
| 263 |
-- |
| 264 |
- export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR |
| 265 |
- export INCLUDEDIR LIBDIR DESTDIR PREFIX |
| 266 |
- |
| 267 |
-diff --git a/lib/Makefile b/lib/Makefile |
| 268 |
-index f372a52..7312fcb 100644 |
| 269 |
---- a/lib/Makefile |
| 270 |
-+++ b/lib/Makefile |
| 271 |
-@@ -21,8 +21,12 @@ lib-c: c/$(CRIU_SO) |
| 272 |
- # |
| 273 |
- # Python bindings. |
| 274 |
- lib-py: |
| 275 |
-+ifeq ($(PYCRIU),yes) |
| 276 |
- $(call msg-gen, $@) |
| 277 |
- $(Q) $(MAKE) -C py all |
| 278 |
-+else |
| 279 |
-+ $(Q) echo "no py criu" |
| 280 |
-+endif |
| 281 |
- .PHONY: lib-py |
| 282 |
- |
| 283 |
- all: lib-c lib-py |
| 284 |
-@@ -39,7 +43,7 @@ clean: |
| 285 |
- $(Q) $(RM) -r build usr |
| 286 |
- .PHONY: clean |
| 287 |
- |
| 288 |
--install: lib-c lib-py ../crit/crit c/criu.pc.in |
| 289 |
-+install: lib-c ../crit/crit c/criu.pc.in |
| 290 |
- $(E) " INSTALL " $(CRIU_SO) |
| 291 |
- $(Q) mkdir -p $(DESTDIR)$(LIBDIR) |
| 292 |
- $(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR) |
| 293 |
-@@ -51,6 +55,4 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in |
| 294 |
- $(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig |
| 295 |
- $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc |
| 296 |
- $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig |
| 297 |
-- $(E) " INSTALL " crit |
| 298 |
-- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) |
| 299 |
- .PHONY: install |
| 300 |
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk |
| 301 |
-index bd40944..3cfbffa 100644 |
| 302 |
---- a/scripts/nmk/scripts/build.mk |
| 303 |
-+++ b/scripts/nmk/scripts/build.mk |
| 304 |
-@@ -87,7 +87,7 @@ builtin-name := $(strip $(builtin-name)) |
| 305 |
- |
| 306 |
- # |
| 307 |
- # Link flags. |
| 308 |
--ld_flags := $(strip $(LDFLAGS) $(ldflags-y)) |
| 309 |
-+ld_flags := $(strip $(RAW_LDFLAGS) $(ldflags-y)) |
| 310 |
- |
| 311 |
- # |
| 312 |
- # $(obj) related rules. |
| 313 |
|
| 314 |
diff --git a/sys-process/criu/files/criu-1.3.1-flags.patch b/sys-process/criu/files/criu-1.3.1-flags.patch |
| 315 |
deleted file mode 100644 |
| 316 |
index 84f5037..0000000 |
| 317 |
--- a/sys-process/criu/files/criu-1.3.1-flags.patch |
| 318 |
+++ /dev/null |
| 319 |
@@ -1,55 +0,0 @@ |
| 320 |
---- criu-1.3.1/Makefile |
| 321 |
-+++ criu-1.3.1/Makefile |
| 322 |
-@@ -102,9 +102,6 @@ |
| 323 |
- |
| 324 |
- ifeq ($(DEBUG),1) |
| 325 |
- DEFINES += -DCR_DEBUG |
| 326 |
-- CFLAGS += -O0 -ggdb3 |
| 327 |
--else |
| 328 |
-- CFLAGS += -O2 |
| 329 |
- endif |
| 330 |
- |
| 331 |
- ifeq ($(GMON),1) |
| 332 |
---- criu-1.3.1/test/zdtm/lib/Makefile |
| 333 |
-+++ criu-1.3.1/test/zdtm/lib/Makefile |
| 334 |
-@@ -1,6 +1,6 @@ |
| 335 |
- include ../Makefile.inc |
| 336 |
- |
| 337 |
--CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 |
| 338 |
-+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 |
| 339 |
- CFLAGS += $(USERCFLAGS) |
| 340 |
- |
| 341 |
- LIBDIR = . |
| 342 |
---- criu-1.3.1/test/zdtm/live/static/Makefile |
| 343 |
-+++ criu-1.3.1/test/zdtm/live/static/Makefile |
| 344 |
-@@ -3,7 +3,7 @@ |
| 345 |
- LIBDIR = ../../lib |
| 346 |
- LIB = $(LIBDIR)/libzdtmtst.a |
| 347 |
- override CPPFLAGS += -I$(LIBDIR) |
| 348 |
--CFLAGS = -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 |
| 349 |
-+CFLAGS = -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 |
| 350 |
- CFLAGS += $(USERCFLAGS) |
| 351 |
- |
| 352 |
- TST_NOFILE = \ |
| 353 |
---- criu-1.3.1/test/zdtm/live/streaming/Makefile |
| 354 |
-+++ criu-1.3.1/test/zdtm/live/streaming/Makefile |
| 355 |
-@@ -3,7 +3,7 @@ |
| 356 |
- LIBDIR = ../../lib |
| 357 |
- LIB = $(LIBDIR)/libzdtmtst.a |
| 358 |
- override CPPFLAGS += -I$(LIBDIR) |
| 359 |
--CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing |
| 360 |
-+CFLAGS = -Wall -fno-strict-aliasing |
| 361 |
- CFLAGS += $(USERCFLAGS) |
| 362 |
- |
| 363 |
- TST_NOFILE = \ |
| 364 |
---- criu-1.3.1/test/zdtm/live/transition/Makefile |
| 365 |
-+++ criu-1.3.1/test/zdtm/live/transition/Makefile |
| 366 |
-@@ -3,7 +3,7 @@ |
| 367 |
- LIBDIR = ../../lib |
| 368 |
- LIB = $(LIBDIR)/libzdtmtst.a |
| 369 |
- override CPPFLAGS += -I$(LIBDIR) |
| 370 |
--CFLAGS = -g -O2 -Wall -Werror |
| 371 |
-+CFLAGS = -Wall |
| 372 |
- CFLAGS += $(USERCFLAGS) |
| 373 |
- |
| 374 |
- TST_NOFILE = \ |
| 375 |
|
| 376 |
diff --git a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch b/sys-process/criu/files/criu-1.7-automagic-libbsd.patch |
| 377 |
deleted file mode 100644 |
| 378 |
index 4dadf95..0000000 |
| 379 |
--- a/sys-process/criu/files/criu-1.7-automagic-libbsd.patch |
| 380 |
+++ /dev/null |
| 381 |
@@ -1,29 +0,0 @@ |
| 382 |
-diff --git a/Makefile.config b/Makefile.config |
| 383 |
-index ce4b8d8..2ef64d3 100644 |
| 384 |
---- a/Makefile.config |
| 385 |
-+++ b/Makefile.config |
| 386 |
-@@ -3,10 +3,12 @@ include scripts/feature-tests.mak |
| 387 |
- |
| 388 |
- CONFIG := include/config.h |
| 389 |
- |
| 390 |
-+ifeq ($(SETPROCTITLE),yes) |
| 391 |
- ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y) |
| 392 |
- LIBS += -lbsd |
| 393 |
- DEFINES += -DCONFIG_HAS_LIBBSD |
| 394 |
- endif |
| 395 |
-+endif |
| 396 |
- |
| 397 |
- ifeq ($(call pkg-config-check,libselinux),y) |
| 398 |
- LIBS := -lselinux $(LIBS) |
| 399 |
-@@ -38,9 +40,11 @@ endif |
| 400 |
- ifeq ($(VDSO),y) |
| 401 |
- $(Q) @echo '#define CONFIG_VDSO' >> $@ |
| 402 |
- endif |
| 403 |
-+ifeq ($(SETPROCTITLE),yes) |
| 404 |
- ifeq ($(call try-cc,$(SETPROCTITLE_INIT_TEST),-lbsd),y) |
| 405 |
- $(Q) @echo '#define CONFIG_HAS_SETPROCTITLE_INIT' >> $@ |
| 406 |
- endif |
| 407 |
-+endif |
| 408 |
- ifeq ($(piegen-y),y) |
| 409 |
- $(Q) @echo '#define CONFIG_PIEGEN' >> $@ |
| 410 |
- endif |
| 411 |
|
| 412 |
diff --git a/sys-process/criu/files/criu-1.8-makefile.patch b/sys-process/criu/files/criu-1.8-makefile.patch |
| 413 |
deleted file mode 100644 |
| 414 |
index 2c1921f..0000000 |
| 415 |
--- a/sys-process/criu/files/criu-1.8-makefile.patch |
| 416 |
+++ /dev/null |
| 417 |
@@ -1,25 +0,0 @@ |
| 418 |
-diff --git a/Makefile.inc b/Makefile.inc |
| 419 |
-index 5f0a552..4abc9ab 100644 |
| 420 |
---- a/Makefile.inc |
| 421 |
-+++ b/Makefile.inc |
| 422 |
-@@ -15,16 +15,11 @@ PREFIX ?= /usr/local |
| 423 |
- SBINDIR ?= $(PREFIX)/sbin |
| 424 |
- MANDIR ?= $(PREFIX)/share/man |
| 425 |
- SYSTEMDUNITDIR ?= $(PREFIX)/lib/systemd/system/ |
| 426 |
--LOGROTATEDIR ?= $(PREFIX)/etc/logrotate.d/ |
| 427 |
--LIBDIR ?= $(PREFIX)/lib |
| 428 |
--# For recent Debian/Ubuntu with multiarch support |
| 429 |
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \ |
| 430 |
-- -qDEB_HOST_MULTIARCH 2>/dev/null) |
| 431 |
--ifneq "$(DEB_HOST_MULTIARCH)" "" |
| 432 |
--LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
| 433 |
--# For most other systems |
| 434 |
--else ifeq "$(shell uname -m)" "x86_64" |
| 435 |
-+LOGROTATEDIR ?= $(SYSCONFDIR)/etc/logrotate.d/ |
| 436 |
-+ifeq "$(shell uname -m)" "x86_64" |
| 437 |
- LIBDIR ?= $(PREFIX)/lib64 |
| 438 |
-+else |
| 439 |
-+LIBDIR ?= $(PREFIX)/lib |
| 440 |
- endif |
| 441 |
- |
| 442 |
- INCLUDEDIR ?= $(PREFIX)/include/criu |
Archives