mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 10:50:54 +00:00
a4cda180dbThis includes Zack Weinberg's patch to fix tests w/ guile-3.0, which I've only applied for 3.0. But in the course of spending a while to get the ebuild working with two impls and only patching one, I found that 2-2 was clearly not cared for upstream anymore as I hit two different issues and one of them had an unreplied-to patch on the ML, so I gave up. Just declare compat w/ 3-0 and worry about older later for this version on the offchance someone requests it. Closes: https://bugs.gentoo.org/877785 Closes: https://bugs.gentoo.org/941404 Signed-off-by: Sam James <sam@gentoo.org>
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
# Note that this patch requires >=guile-3, so we apply it conditionally.
|
|
# https://lists.gnu.org/archive/html/guile-devel/2024-05/msg00012.html
|
|
#
|
|
# Fix compile and test failures due to bitvector API change.
|
|
# https://bugs.gentoo.org/877785
|
|
--- a/src/math/primes.scm 2024-05-23 19:26:16.757865343 -0400
|
|
+++ b/src/math/primes.scm 2024-05-23 19:28:20.797358650 -0400
|
|
@@ -114,7 +114,7 @@
|
|
(set! prime:prime-sqr (* nexp nexp))
|
|
(set! prime:sieve (make-bitvector nexp #f))
|
|
(for-each (lambda (prime)
|
|
- (bitvector-set! prime:sieve prime #t))
|
|
+ (bitvector-set-bit! prime:sieve prime))
|
|
primes)
|
|
(set! prime:products (reverse (cons comp comps))))
|
|
(else
|
|
@@ -132,7 +132,7 @@
|
|
There is a slight chance, @code{(expt 2 (- prime:trials))}, that a
|
|
composite will return @code{#t}."
|
|
(set! n (abs n))
|
|
- (cond ((< n (bitvector-length prime:sieve)) (bitvector-ref prime:sieve n))
|
|
+ (cond ((< n (bitvector-length prime:sieve)) (bitvector-bit-set? prime:sieve n))
|
|
((even? n) #f)
|
|
((primes-gcd? n prime:products) #f)
|
|
((< n prime:prime-sqr) #t)
|
|
|