diff options
| -rw-r--r-- | sys-process/criu/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-process/criu/Manifest | 34 | ||||
| -rw-r--r-- | sys-process/criu/criu-1.6.ebuild | 31 |
3 files changed, 46 insertions, 25 deletions
diff --git a/sys-process/criu/ChangeLog b/sys-process/criu/ChangeLog index 1e181f45ee10..bb5fd21aca9f 100644 --- a/sys-process/criu/ChangeLog +++ b/sys-process/criu/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-process/criu # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.24 2015/06/15 10:29:53 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/ChangeLog,v 1.25 2015/07/13 05:39:53 vapier Exp $ + + 13 Jul 2015; Mike Frysinger <vapier@gentoo.org> criu-1.6.ebuild: + Fix ARCH & OBJCOPY handling for cross-compiling #552234 by Kevin Cernekee. *criu-1.6 (15 Jun 2015) @@ -120,4 +123,3 @@ 03 May 2013; Tim Harder <radhermit@gentoo.org> +files/crtools-0.4-flags.patch, +criu-0.5.ebuild, +metadata.xml: Upstream rename and version bump of sys-process/crtools. - diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest index cb83df6a3668..55fa4c8bfea6 100644 --- a/sys-process/criu/Manifest +++ b/sys-process/criu/Manifest @@ -8,25 +8,23 @@ AUX criu-1.5.1-arm64-ptrace.patch 341 SHA256 777bae08b06dae307b45f6027385085dcb3 DIST criu-1.5.2.tar.bz2 457573 SHA256 e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345 SHA512 c7916fde1f63cb66a89e71867c204a251dfa2b9de703ac467bc460c6f0d895947996fd466c17cb529d2502aba7b75b8b30162baf3944fefebb71625fb88e5458 WHIRLPOOL c951692e684bd1b032bde1b534a4f4bd4b769a1e73afc56c74711ac943da907f638489205e8be2c68bbc345c1da8b641a7175dccd34aad907ca3251c3f2156a0 DIST criu-1.6.tar.bz2 484513 SHA256 35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993 SHA512 0672c7342ffed7c23fdb747b7bd3b08f205a4bf3965577991d007f71e70be5243247e52ad823f0099713f7977f6f4be5403ea2073a840b5024b6a0f240f65bdc WHIRLPOOL da5a767b3f89efdd2cda21331cc60e60e0cdbab163a55ef1a3080d3601df924688d612c7e76000c3d383cdb22002b16c28ad2740b7bc6aba784021f31ebc54c4 EBUILD criu-1.5.2.ebuild 1388 SHA256 125b7d030592c13b3ae4b4120852443328db63a23ba58232eca27340ffaff5b7 SHA512 d0ac03af4110e8e3928a44d20daa9f14ec21d7f54a7bb6b9f203ca7f66367d15a92170eaede4494cfa697cdc2200d039f4326c00f7ffd39a7693af099a4ac381 WHIRLPOOL 67377e78eb161287b12d1a22153e95838a7e9279dc069515555c1018bdb9cb82844b0bdac72388296a5c69565329c0c12a496794a9d0656b902ebcb143a89443 -EBUILD criu-1.6.ebuild 1389 SHA256 a6bc92292852050ab1b432e9bb351f1945c993b72aafde5196ab495c2e0f8a12 SHA512 663fb6c2f819df7b2b4953c4315e0bf3c5a6edb215133ac59edfab2f38147532575be3cf628e4c8709fbfcf94fe9c77e95fadb24a54ebf7ce3bb474fdaad12ad WHIRLPOOL ae8e2214bb9c2725ecab548f2a9d0369284efb776f6776f9bea1b59cdb339fc43d85dd1960b576f5043fea72977129198ddc4078b5602040e90a23162aef7e8d -MISC ChangeLog 3578 SHA256 d3abe7111b27141e80ba7a0125a8e02ff1d131580fa56ffafdfa1ff8d10c60ce SHA512 be40ce84f4aa02ae2397fb532cbac7c94ff1dc5c56a52bb8f1bc5522f6b9b2e2a48c4bee14d7bc6f518a0b44591a37017fac2870c60bf6681a02fbd99c2474c6 WHIRLPOOL c26577f1ff81432ee537be0488135239f64d7c3d2492b830d4d4d76465f125e0f390c8b797851d7d5046a125d0276edeb7de46b137a027916f278734cf57713d +EBUILD criu-1.6.ebuild 1723 SHA256 30466df09cd8adcd862fd5cbcfc2023431391a728a36682125f1bfb46f29378e SHA512 4fd7d244883fbf0fde10a6c85a8f95ef9f2d49a7d9d2c9df19b121aa24974a8d3672360134f5af55713b44b930a4cd427d56d84f73038c0f4df40107d055e03f WHIRLPOOL 2e4d8d2168b9e9567ec4014c9cc6de101e20721cc9fcd0299becb02f2a893711d7415376d9cdccfa3666182e317ac03859e89bb7d829ebfc3ca40911ed15eec1 +MISC ChangeLog 3724 SHA256 af11e745ab8753131394509b79e0a251bad2bf7b185a91d2b01463dfa0c1348c SHA512 d91016f93b2a469a77f7f2d5faa48da3347ef8f7b69649a3e6be1f6bf51a7a3270ef4c7f3722529fd06135615cac72ee43e520329bd63ac7873ceafad8fdfecb WHIRLPOOL adc87f4f694e6cb3f3a8355fe8cf63b606744e7b519294a8317aa574e5037a089ad4bf4861fff214693bab455b055b4099abff07ff6741135ffc4e6256c73f8c MISC metadata.xml 367 SHA256 d9d70f8ffaabb1d3c702b245cd28bc33bc312244bb3dd465c8d56c11db44f739 SHA512 a31e9e6c490917e5e0a9d038cfadcaf57118e12bba936e2ce522b06432ff4e891e0aca8f048c772c882034b87173176539ae502ad043f10e9b0eb2f00667181b WHIRLPOOL cfd118b2e4c7fd7fdcbfb82a934ba6572a8b09927f483b9b2cfa8f46fe637ba05a1934e7f82c5ebf64588c0a65a611eeda58f3ef082d54e77be4ee0599ec9fd2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.1 +Version: GnuPG v2 -iQJ8BAEBCABmBQJVfxnEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz -MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtvykQAIQZlF5FtWkzUUcd551rmUiG -3Oo55DLOURaqXygrzcLXUvPnQwQSH4k3BQIOL1iWsv3cz2GHbRduLGypEknYd9RP -ny7sPgQwvPjoNF90BqmiSsKsFjZIIFkUY+yui8CWfFlXEGpPQ9YZXTGY73aoJh3z -UaJ0oAIWKUnSlM6XTyn4wAb+sGPYHnvlExnJYOsYIwUJyonAPtbOmkwGbZ4ym3R7 -OWWS16IqYZyqIIq4LNblbLL9JMBNdYgtHepFV9v/KqK1RB+GIq+t74bmx6N6if0U -hW7XLFtKYtVQjiw5OYYcc/0OTa3aJXOaYNtkXtfiYo1ZXLnWddsb2SiuDMUyzLqm -5nxuIhzTOQTSNQZZ8h14JEkzgJZkGKKZBxMt77EShLu2IbZw36L9a1mMcIQq7nff -Jz2NY5L/QasVPBk79AiCS2ys97fTLeJZ3q3RK2kIQRrKjph0twV1NiOBsPxEG0GU -Cjk6mdNcYipmUHBzYVGRM/M5FcroqetmO2G0lkI3ho4IJENu2ce7WaHHYaM2iQNI -sDFlDvgtNLd/cPp6ndlh/K7Kg2hwrBBkZCRoPRuXH7xn9scdKEMCwcBhtVNjfYgT -aqkMp97+qe3gvKjNJxHbI8uy+mPZyz+juYFymDfb4EMUTrK8kQKsKXKD0Pa5el+u -+hrpYqSFc0bZsDXOZTSb -=odkZ +iQIcBAEBCAAGBQJVo08qAAoJEPGu1DbS6WIAmDQQAIcCcnmeDUagFDoiI0zf8DH8 +iniIZpF9lmadsAEA1gtcO5ygxrKPV404M2IoPID1m1vMW1pIazq37nlQWgu5RCxb +xCznoiEiu9+DGQKLuKmjjsJVHelf/0hdF7qV+ia6DYt0r9gzmGyNF8KHOikGnQBq +RpjE36bEUDLMrEjLGY+QlrvXFl1CPkjpVJIaM76ULKQQ5h1Qm6nUIkiP8H4tW/oB +h7Va9S5Sn/pkn5lJTCGoBI54NpW/8Z+MmZS2MPmLGmiWaoyXs32yYNzm8ftCtk0K +mqQuyYQOr/OUF7YIYtKYgaNYZ3ghKWxmGHJkcZE6AKz5WMYJVn2f92ooonwnkNb+ +VdyRuPxWi0qrUR+sDdaU5LG5RoT1Sy4PDVoeEJWkglvrMXFCvKr4u+grjfBNzrGS ++jcc+xsgvyTv61qmyh9cd2OadB7JbYS/IqzxjqHLTXHrA8/6ECayxXee+Fi1Yz/F +AZ1O4bL7afZEDY0psFu2uywE8ZdWy0C5Mp+SSNs8lJm/nLpHI2EQlXG1NzqEFPu7 +TtpCjeDQaWsA/4+0AuTrKD2PnCjyBpdSUGNcpsIZiAX2E32tg6pvM/3G4uRLa2KM +n1WDijODS2pqUsrV597GOuqBo1lgv/+v9UTo88R9hpg3S4i4TKiQny8bx9fvV0B3 +CuM/TBEUDjKL6eWTmj5M +=44fj -----END PGP SIGNATURE----- diff --git a/sys-process/criu/criu-1.6.ebuild b/sys-process/criu/criu-1.6.ebuild index 30a7263354c5..39b45e2e5a47 100644 --- a/sys-process/criu/criu-1.6.ebuild +++ b/sys-process/criu/criu-1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.6.ebuild,v 1.1 2015/06/15 10:29:53 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/criu/criu-1.6.ebuild,v 1.2 2015/07/13 05:39:53 vapier Exp $ EAPI=5 @@ -32,19 +32,40 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.5-automagic-libbsd.patch } +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86_64";; + arm64) echo "aarch64";; + x86) echo "i386";; + *) echo "${ARCH}";; + esac +} + src_compile() { - unset ARCH - emake CC="$(tc-getCC)" LD="$(tc-getLD)" V=1 SETPROCTITLE=$(usex setproctitle) WERROR=0 all docs + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 \ + SETPROCTITLE=$(usex setproctitle) \ + all docs } src_test() { # root privileges are required to dump all necessary info if [[ ${EUID} -eq 0 ]] ; then - emake -j1 CC="$(tc-getCC)" V=1 WERROR=0 test + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test fi } src_install() { - emake SYSCONFDIR="${EPREFIX}"/etc PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install + emake \ + ARCH="$(criu_arch)" \ + SYSCONFDIR="${EPREFIX}"/etc \ + PREFIX="${EPREFIX}"/usr \ + DESTDIR="${D}" \ + install dodoc CREDITS README.md } |