diff options
| -rw-r--r-- | main/guile/APKBUILD | 33 | ||||
| -rw-r--r-- | main/guile/fix-defines.patch | 24 | ||||
| -rw-r--r-- | main/guile/guile-1.8.7-gcc45.patch | 15 |
3 files changed, 16 insertions, 56 deletions
diff --git a/main/guile/APKBUILD b/main/guile/APKBUILD index c4563e300f..f4bc993fb4 100644 --- a/main/guile/APKBUILD +++ b/main/guile/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=guile -pkgver=1.8.8 -pkgrel=2 +pkgver=2.0.11 +pkgrel=0 pkgdesc="Guile is a portable, embeddable Scheme implementation written in C" url="http://www.gnu.org/software/guile/" arch="all" license="GPL" -subpackages="$pkgname-dev $pkgname-doc" -makedepends="gmp-dev libtool ncurses-dev texinfo" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +makedepends="gmp-dev libtool ncurses-dev texinfo libunistring-dev libffi-dev + gc-dev" depends= +depends_dev="guile" install= source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz - guile-1.8.7-gcc45.patch - fix-defines.patch + strtol_l.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -36,22 +37,20 @@ build() { --host=$CHOST \ --prefix=/usr \ --disable-error-on-warning \ + --disable-static \ || return 1 - make LDFLAGS+="-lpthread" || return 1 + make || return 1 } package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 - rm "$pkgdir"/usr/lib/*.la + rm "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/charset.alias } -md5sums="18661a8fdfef13e2fcb7651720aa53f3 guile-1.8.8.tar.gz -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" +md5sums="e532c68c6f17822561e3001136635ddd guile-2.0.11.tar.gz +54b76be46ecc9333e2a57cc0906c1927 strtol_l.patch" +sha256sums="e6786c934346fa2e38e46d8d81a622bb1c16d130153523f6129fcd79ef1fb040 guile-2.0.11.tar.gz +2ba49adb27db50f5ec33779ce2f002cafde99a04038ca689bee7d2098296ce33 strtol_l.patch" +sha512sums="dc1a30d44e6d432fab2407d72385e959af863f6feba6cca5813b4de24c92200c78b44f336d1f4fa8c7b4058dea880982787c69888c91a2236fd2fb1d313137fd guile-2.0.11.tar.gz +596efb03c65df98ea9afd932cb67e5b436e35fbf2442630e8a1854818f246b5a24eb920e3502ba28b882f0afb27c5148f1ff509c29baa91a7f37b3ecdc28c000 strtol_l.patch" diff --git a/main/guile/fix-defines.patch b/main/guile/fix-defines.patch deleted file mode 100644 index 341354d468..0000000000 --- a/main/guile/fix-defines.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 */ diff --git a/main/guile/guile-1.8.7-gcc45.patch b/main/guile/guile-1.8.7-gcc45.patch deleted file mode 100644 index 6c9c2cd443..0000000000 --- a/main/guile/guile-1.8.7-gcc45.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixing docs build with gcc-4.5 - -http://bugs.gentoo.org/317175 - -Patch scavenged from -http://lists.gnu.org/archive/html/guile-devel/2009-11/msg00078.html - ---- ./libguile/guile-snarf-docs.in -+++ ./libguile/guile-snarf-docs.in -@@ -23,4 +23,4 @@ - ## Let the user override the preprocessor autoconf found. - test -n "${CPP+set}" || CPP="@CPP@" - --${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" -+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@" |