aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-09-30 13:50:02 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-09-30 13:50:02 +0000
commit2a459269ce32598411253ae323fa8cc2f71821fd (patch)
treeeb813c39080f3862e72edffe66decab644aabf25 /main
parent7dc7156b5543eba20d6b74b63ae7fd6e817a51df (diff)
downloadaports-2a459269ce32598411253ae323fa8cc2f71821fd.tar.bz2
aports-2a459269ce32598411253ae323fa8cc2f71821fd.tar.xz
main/guile: fix musl build
Diffstat (limited to 'main')
-rw-r--r--main/guile/APKBUILD12
-rw-r--r--main/guile/fix-defines.patch24
2 files changed, 34 insertions, 2 deletions
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD
index 5c034fbd23..c4563e300f 100644
--- a/main/guile/APKBUILD
+++ b/main/guile/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=guile
pkgver=1.8.8
-pkgrel=1
+pkgrel=2
pkgdesc="Guile is a portable, embeddable Scheme implementation written in C"
url="http://www.gnu.org/software/guile/"
arch="all"
@@ -12,6 +12,7 @@ depends=
install=
source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
guile-1.8.7-gcc45.patch
+ fix-defines.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -46,4 +47,11 @@ package() {
}
md5sums="18661a8fdfef13e2fcb7651720aa53f3 guile-1.8.8.tar.gz
-608a4d2d7bc072d5edc34aa2be1f609f guile-1.8.7-gcc45.patch"
+608a4d2d7bc072d5edc34aa2be1f609f guile-1.8.7-gcc45.patch
+bd5fce3fa8fc1d82906b97f698b5d351 fix-defines.patch"
+sha256sums="c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 guile-1.8.8.tar.gz
+edd5e94d3521db44c5ee345df8d999260dc41d212ad30fafe12fba3bdf7351af guile-1.8.7-gcc45.patch
+b6986585ee61662d6c13a294bd51c97ef4ead7754694ab9207bb7018c2f072bf fix-defines.patch"
+sha512sums="ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 guile-1.8.8.tar.gz
+4b15e8f04e6c45c088bb50ec4c12f40702f0ce38cb471b674b41c8d94be34e8ab9077a80e8cea6288b2744d7a7bc47d1dc606302102edf26e0309ace0c461946 guile-1.8.7-gcc45.patch
+b19d72a179cae13bafe8aa9af15661b79406816d296042f0b39a2daa61446f3db82763fe17aa74d3a7f0194a63fe2d80424acaccda4e7288bb8047efdd0197ad fix-defines.patch"
diff --git a/main/guile/fix-defines.patch b/main/guile/fix-defines.patch
new file mode 100644
index 0000000000..341354d468
--- /dev/null
+++ b/main/guile/fix-defines.patch
@@ -0,0 +1,24 @@
+--- guile-1.8.8.orig/libguile/fports.c
++++ guile-1.8.8/libguile/fports.c
+@@ -78,8 +78,8 @@
+ #define OFF_T_MAX LONG_MAX
+ #define OFF_T_MIN LONG_MIN
+ #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
+-#define OFF_T_MAX LONG_LONG_MAX
+-#define OFF_T_MIN LONG_LONG_MIN
++#define OFF_T_MAX LLONG_MAX
++#define OFF_T_MIN LLONG_MIN
+ #else
+ #error Oops, unknown OFF_T size
+ #endif
+--- guile-1.8.8.orig/libguile/gc_os_dep.c
++++ guile-1.8.8/libguile/gc_os_dep.c
+@@ -1459,7 +1459,7 @@
+ # undef __KERNEL__
+ # endif
+
+-# else
++# elif defined(__GLIBC__)
+
+ /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
+ /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */