diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-09-25 20:21:45 +0100 |
| commit | c719fdcee603a5a706a45d10cb598762d56a727d (patch) | |
| tree | 620cbf137661399a3fb1eff92914204f9a970713 /sys-apps/minijail | |
| parent | cc4618c9ba3d974948ebf340b542d8cb01db2f55 (diff) | |
gentoo resync : 25.09.2021
Diffstat (limited to 'sys-apps/minijail')
| -rw-r--r-- | sys-apps/minijail/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/minijail/minijail-17.ebuild (renamed from sys-apps/minijail/minijail-9.ebuild) | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index 037423195741..d0a0295b9be4 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,7 +1,7 @@ AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a AUX minijail-9-makefile.patch 1589 BLAKE2B d2b253f769e79c179fce51b858ce9b7b70dec806e7f3f330928e5befc7a6fc12e4a09e5fca0e29404badbab2f389bb4c9385d0ecc555610d3b45df272c5d34e1 SHA512 38a3afe8c17f591e8172ad6725f04d5a898ee3ec3a97ee99c6118c1c12189061906a442b95243e7907031c194f0477c3bdbc6d96df4923b43487f60ededa403b DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 -DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717 +DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6 -EBUILD minijail-9.ebuild 1714 BLAKE2B 26d4cfafe924ab1616065eda666a69915f52c337aba699e100d5c18c7e9e711c4f79ea74725f0570dcb9dd71d8c32338a7aa6bde2a5173f426c2cb4e87ed4f14 SHA512 25592129d6483b2713021994a43d25b8eb103bd80fd40e844ed27d7040f16733429f36072048235a1c5ed86dc9150d5db32d7400c158cdb8d30333b27a799c33 +EBUILD minijail-17.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6 MISC metadata.xml 316 BLAKE2B 1c0d0d8d3d56290e6c416abd016b8e9884d281b4c8700d5e229bbd820946c9b962c148f4d838b3206f091c9340d93febf69c8dab0af58101c5c5128fceea888e SHA512 f31d33694241be5dc691ca273d0712a062b84eaccb44adc3a50a1085a451543ff1c2d20960444474c2d32121a52c2b15c2510c802a59983534c6176906fbaaee diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-17.ebuild index bca6a4432644..9f0c093fd994 100644 --- a/sys-apps/minijail/minijail-9.ebuild +++ b/sys-apps/minijail/minijail-17.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" inherit linux-info toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="+seccomp test" RESTRICT="!test? ( test )" @@ -27,7 +27,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}-linux-v${PV}" PATCHES=( - "${FILESDIR}/minijail-9-makefile.patch" + "${FILESDIR}/minijail-12-makefile.patch" ) pkg_pretend() { @@ -40,17 +40,22 @@ src_configure() { export LIBDIR="/usr/$(get_libdir)" export USE_seccomp="$(usex seccomp)" export USE_SYSTEM_GTEST=yes - export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)" - export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)" + if use test; then + export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)" + export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)" + else + export GTEST_CXXFLAGS='' GTEST_LIBS='' + fi + export VERBOSE=1 } src_compile() { - tc-env_build emake VERBOSE=1 all parse_seccomp_policy + tc-env_build emake all parse_seccomp_policy } src_test() { GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \ - tc-env_build emake VERBOSE=1 tests + tc-env_build emake tests } src_install() { @@ -59,6 +64,7 @@ src_install() { dobin parse_seccomp_policy doman minijail0.[15] + dodoc README.md local include_dir="/usr/include" @@ -67,6 +73,5 @@ src_install() { doins libminijail.pc insinto "${include_dir}" - doins libminijail.h - doins scoped_minijail.h + doins libminijail.h scoped_minijail.h } |