Skip to content

Commit

Permalink
guile: backport commits to fix 32-bit
Browse files Browse the repository at this point in the history
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71891 says the issue was
fixed in aff9ac968840e9c86719fb613bd2ed3c39b9905c, but to avoid
conflicts (which I don't know how to resolve, not knowing scheme), also
pull in 5e6288c9304b60f1875a44808ee3858e3d6efc83
0dab58fc2a6ac6a8354439749d598f8c24f57ddd and
e45b70dcded37eb77e71ec30445b12040b6bb1b7.
  • Loading branch information
jeremyd2019 committed Jan 7, 2025
1 parent 46b716e commit 45b60e5
Showing 1 changed file with 21 additions and 3 deletions.
24 changes: 21 additions & 3 deletions guile/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pkgbase=guile
pkgname=("${pkgbase}" "lib${pkgbase}" "lib${pkgbase}-devel")
pkgver=3.0.10
pkgrel=2
pkgrel=3
pkgdesc="a portable, embeddable Scheme implementation written in C"
url="https://www.gnu.org/software/guile/"
msys2_references=(
Expand Down Expand Up @@ -37,7 +37,11 @@ source=("https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgbase}-${pkgver}.tar.xz"
'0302-In-i18n.test-add-unresolved-for-host-type-msys.patch'
'0303-In-tests-add-dynamic-link-to-msys-2.0-for-host-type-msys.patch'
'0304-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch'
'0305-Remove-failed-test-00-repl-server.test.patch')
'0305-Remove-failed-test-00-repl-server.test.patch'
'0401-Narrow-parameter-of-logand-immediate-if-no-bits-used.patch'
'0402-Fix-fixpoint-needed-bits-computation-in-specialize-n.patch'
'0403-Fix-boxing-of-non-fixnum-negative-u64-values.patch'
'0404-Run-sigbits-fixpoint-based-on-use-def-graph-not-cfg.patch')
sha256sums=('bd7168517fd526333446d4f7ab816527925634094fbd37322e17e2b8d8e76388'
'76482f80bd2b2ade6cdc015230f95a34ef9e13d3798dcd88b881afb63f7bab44'
'07c0dd3718b8edd8eef545c90b7bf013bdd9418f0eda662c29e31064c4870422'
Expand All @@ -50,7 +54,11 @@ sha256sums=('bd7168517fd526333446d4f7ab816527925634094fbd37322e17e2b8d8e76388'
'd75375ab4a78695f2aa04b1499e85dce4f53599271cd88f9e51ae7b27590118a'
'150201aa84a21eb09bcf46784c92496801f014ee4091d88e6b9e1aedeece6a34'
'eb683df1331e063fd8d190650a01f30baba06f48b2c6dbce998ac2b3811574c6'
'1f2b39f919a508dc83363daa80b5ccde14a9d07d70cea2f126b828494af675be')
'1f2b39f919a508dc83363daa80b5ccde14a9d07d70cea2f126b828494af675be'
'b3012ea06e6f2e4a98ce3d72e9faa84662c3b027bf4023095375005368112ea1'
'944699d89f0e4f068f4a169e8a4d063e8f5295c1f1c19411d9b1d319b3b8ade1'
'e3e846eabe2a1e8b3e6136aca219a7b507a737fbbfa6e77e0864931e7f4549ff'
'80a3e4477a96cf68e29a8e8f688d48b97564c52f8dcd1c4a127749d4e45fd013')

prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
Expand All @@ -71,6 +79,16 @@ prepare() {
patch -p1 -i ${srcdir}/0304-Skip-tests-using-setrlimit-for-MSYS-as-done-for-Cygwin.patch
patch -p1 -i ${srcdir}/0305-Remove-failed-test-00-repl-server.test.patch

# backports to fix 32-bit
# https://git.savannah.gnu.org/gitweb/?p=guile.git;a=patch;h=5e6288c9304b60f1875a44808ee3858e3d6efc83
patch -p1 -i ${srcdir}/0401-Narrow-parameter-of-logand-immediate-if-no-bits-used.patch
# https://git.savannah.gnu.org/gitweb/?p=guile.git;a=patch;h=0dab58fc2a6ac6a8354439749d598f8c24f57ddd
patch -p1 -i ${srcdir}/0402-Fix-fixpoint-needed-bits-computation-in-specialize-n.patch
# https://git.savannah.gnu.org/gitweb/?p=guile.git;a=patch;h=e45b70dcded37eb77e71ec30445b12040b6bb1b7
patch -p1 -i ${srcdir}/0403-Fix-boxing-of-non-fixnum-negative-u64-values.patch
# https://git.savannah.gnu.org/gitweb/?p=guile.git;a=patch;h=aff9ac968840e9c86719fb613bd2ed3c39b9905c
patch -p1 -i ${srcdir}/0404-Run-sigbits-fixpoint-based-on-use-def-graph-not-cfg.patch

autoreconf -fi
}

Expand Down

0 comments on commit 45b60e5

Please sign in to comment.