diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2021-03-17 00:22:31 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2021-03-17 00:25:44 +0100 |
| commit | da4724cbe9c2d6a79f205ae98787c79263719d22 (patch) | |
| tree | 0ad830ae0744764e36a91b0fdf7c574e3d58e0c8 | |
| parent | 2559412bdbc1d7a5105235bbc285b2c348f2f483 (diff) | |
testing/proot: fix ptrace-2 in tests
| -rw-r--r-- | testing/proot/APKBUILD | 7 | ||||
| -rw-r--r-- | testing/proot/tests-musl-compat.patch | 26 |
2 files changed, 31 insertions, 2 deletions
diff --git a/testing/proot/APKBUILD b/testing/proot/APKBUILD index bbfe1caadd2..cf565ebef1a 100644 --- a/testing/proot/APKBUILD +++ b/testing/proot/APKBUILD @@ -19,7 +19,9 @@ makedepends=" uthash-dev " subpackages="care $pkgname-doc $pkgname-static" -source="https://github.com/proot-me/proot/archive/$_gitrev/$pkgname-$_gitrev.tar.gz" +source="https://github.com/proot-me/proot/archive/$_gitrev/$pkgname-$_gitrev.tar.gz + tests-musl-compat.patch + " builddir="$srcdir/$pkgname-$_gitrev" options="!check" # FIXME: several tests are failing @@ -56,4 +58,5 @@ static() { install -Dm 0755 "$builddir"/src-static/proot "$subpkgdir"/usr/bin/proot.static } -sha512sums="0b4617486630255ec7b26a0aae8e07c42ee302ea7d6aed676644cf4507f5951206d83a65d22263cb17ea803cfbec3b93c01d8936c401c58f20ea41ffad9a9230 proot-8c0ccf7db18b5d5ca2f47e1afba7897fb1bb39c0.tar.gz" +sha512sums="0b4617486630255ec7b26a0aae8e07c42ee302ea7d6aed676644cf4507f5951206d83a65d22263cb17ea803cfbec3b93c01d8936c401c58f20ea41ffad9a9230 proot-8c0ccf7db18b5d5ca2f47e1afba7897fb1bb39c0.tar.gz +d09de6d776072e9991abd04e294e6d36bd1634b9e972294a112526ebf3f63e919d01755de1ecd7253d614b41b07fe6882df8787c638b8576bcf2555abcafa466 tests-musl-compat.patch" diff --git a/testing/proot/tests-musl-compat.patch b/testing/proot/tests-musl-compat.patch new file mode 100644 index 00000000000..8a92c3fa52a --- /dev/null +++ b/testing/proot/tests-musl-compat.patch @@ -0,0 +1,26 @@ +The same change was made in src/. + +--- a/test/ptrace-2.c ++++ b/test/ptrace-2.c +@@ -52,6 +52,12 @@ + # endif + #endif + ++#if defined(__GLIBC__) ++# define PTRACE_REQUEST_TYPE enum __ptrace_request ++#else ++# define PTRACE_REQUEST_TYPE int ++#endif ++ + /** + * Compute the offset of the register @reg_name in the USER area. + */ +@@ -200,7 +206,7 @@ + + int main(int argc, char *argv[]) + { +- enum __ptrace_request restart_how; ++ PTRACE_REQUEST_TYPE restart_how; + int last_exit_status = -1; + pid_t *pids = NULL; + long status; |