Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/
Date: Wed, 05 Jun 2019 07:57:51
Message-Id: 1559721404.e074e6fa71c94cea6a6693822f33fc3ea6afc1d1.grobian@gentoo
1 commit: e074e6fa71c94cea6a6693822f33fc3ea6afc1d1
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 5 07:56:44 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 5 07:56:44 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e074e6fa
7
8 libq/hash: fix compilation without HAVE_SSL and HAVE_BLAKE2B
9
10 Bug: https://bugs.gentoo.org/687374
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 libq/hash.c | 4 ++++
14 1 file changed, 4 insertions(+)
15
16 diff --git a/libq/hash.c b/libq/hash.c
17 index 8ce29d7..32d047a 100644
18 --- a/libq/hash.c
19 +++ b/libq/hash.c
20 @@ -131,6 +131,7 @@ hash_compute_file(
21
22 while ((len = fread(data, 1, sizeof(data), f)) > 0) {
23 *flen += len;
24 +#if defined(HAVE_SSL) || defined(HAVE_BLAKE2B)
25 #pragma omp parallel sections
26 {
27 #ifdef HAVE_SSL
28 @@ -158,9 +159,11 @@ hash_compute_file(
29 }
30 #endif
31 }
32 +#endif /* HAVE_SSL || HAVE_BLAKE2B */
33 }
34 fclose(f);
35
36 +#if defined(HAVE_SSL) || defined(HAVE_BLAKE2B)
37 #pragma omp parallel sections
38 {
39 #ifdef HAVE_SSL
40 @@ -199,4 +202,5 @@ hash_compute_file(
41 }
42 #endif
43 }
44 +#endif /* HAVE_SSL || HAVE_BLAKE2B */
45 }