diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-18 10:36:22 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-18 10:36:22 +0100 |
| commit | 483124bc484d65b4036c098a700681656e6b69fb (patch) | |
| tree | 82abb1736aa1e0f1d91f2ffa660d7f56617dc0db | |
| parent | f9bff8614be32f9c2c1a54da80eaed1365b49be3 (diff) | |
| download | guix-483124bc484d65b4036c098a700681656e6b69fb.tar.gz | |
gnu: libaio: Fix tests on 32 bit systems.
* gnu/packages/patches/libaio-32bit-test.patch: New file. * gnu/packages/linux.scm (libaio): Add patch. * gnu/local.mk (dist_patch_DATA): Register patch.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/libaio-32bit-test.patch | 26 |
3 files changed, 29 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a4954f9b35..6a7e41c476 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1406,6 +1406,7 @@ dist_patch_DATA = \ %D%/packages/patches/liba52-link-with-libm.patch \ %D%/packages/patches/liba52-set-soname.patch \ %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ + %D%/packages/patches/libaio-32bit-test.patch \ %D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9da2e62c07..e95e771bf2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5535,7 +5535,8 @@ Linux Device Mapper multipathing driver: name "-" version ".tar.gz"))) (sha256 (base32 - "02r0g2vfv6kfljplm3ga93w4xw13q2wixbn9hwi7ahqdzp2x2i1c")))) + "02r0g2vfv6kfljplm3ga93w4xw13q2wixbn9hwi7ahqdzp2x2i1c")) + (patches (search-patches "libaio-32bit-test.patch")))) (build-system gnu-build-system) (arguments (list #:make-flags diff --git a/gnu/packages/patches/libaio-32bit-test.patch b/gnu/packages/patches/libaio-32bit-test.patch new file mode 100644 index 0000000000..0da8e25c69 --- /dev/null +++ b/gnu/packages/patches/libaio-32bit-test.patch @@ -0,0 +1,26 @@ +This fix comes from an upstream pull request, see +https://pagure.io/libaio/pull-request/22#commit_list + +diff --git a/harness/cases/23.t b/harness/cases/23.t +index cc5a8a1..9bbb05c 100644 +--- a/harness/cases/23.t ++++ b/harness/cases/23.t +@@ -72,7 +72,7 @@ static void fail_errno(const char *format, ...) + static void *thrproc2(void *arg) + { + for (;;) { +- off_t offset = 0; ++ off64_t offset = 0; + + pthread_barrier_wait(&barrier); + if (exiting) +@@ -92,7 +92,7 @@ static void *thrproc3(void *arg) + { + for (;;) { + char c; +- off_t offset = 0; ++ off64_t offset = 0; + + pthread_barrier_wait(&barrier); + if (exiting) + |