Update to guile2-2.0.12.
- drop the gettext MODULE
This commit is contained in:
ajacoutot
parent
f5f292b809
commit
a7a2643b0e
@ -1,35 +1,38 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2015/04/17 05:23:29 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2016/08/27 14:51:36 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNU's Ubiquitous Intelligent Language for Extension
|
||||
|
||||
VERSION= 2.0.11
|
||||
VERSION= 2.0.12
|
||||
DISTNAME= guile-${VERSION}
|
||||
PKGNAME= guile2-${VERSION}
|
||||
V= ${VERSION:C,.[0-9]+$,,}
|
||||
SUBST_VARS= V
|
||||
REVISION= 1
|
||||
|
||||
CATEGORIES= lang
|
||||
|
||||
HOMEPAGE= https://www.gnu.org/software/guile/
|
||||
|
||||
SHARED_LIBS += guile-2.0 0.0 # 29.2
|
||||
SHARED_LIBS += guilereadline-v-18 0.0 # 18.0
|
||||
SHARED_LIBS += guile-2.0 0.1 # 30.0
|
||||
SHARED_LIBS += guilereadline-v-18 0.0 # 18.0
|
||||
|
||||
# GPLv3, LGPLv3
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += c ffi gc gmp ltdl m ncurses pthread readline unistring
|
||||
WANTLIB += c ffi gc gmp iconv intl ltdl m ncurses pthread readline
|
||||
WANTLIB += unistring
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
|
||||
|
||||
MODULES= devel/gettext
|
||||
# vm-engine.c:40: internal compiler error: in unify_nodes, at tree-ssa-structalias.c:1231
|
||||
MODULES += gcc4
|
||||
MODGCC4_ARCHS= *
|
||||
|
||||
USE_GMAKE= Yes
|
||||
|
||||
RUN_DEPENDS= devel/slib
|
||||
LIB_DEPENDS= converters/libunistring \
|
||||
devel/boehm-gc \
|
||||
devel/gettext \
|
||||
devel/gmp \
|
||||
devel/libffi \
|
||||
devel/libtool,-ltdl
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (guile-2.0.11.tar.gz) = 5nhsk0NG+i445G2NgaYiuxwW0TAVNSP2Ep/Nee8fsEA=
|
||||
SIZE (guile-2.0.11.tar.gz) = 7516053
|
||||
SHA256 (guile-2.0.12.tar.gz) = jjgpMOoXvFR7IjSbuoGcr2ExP23p7REOfYfx7Gg0kCY=
|
||||
SIZE (guile-2.0.12.tar.gz) = 7421088
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
$OpenBSD: patch-libguile_foreign_c,v 1.1 2015/04/17 05:23:30 ajacoutot Exp $
|
||||
|
||||
From 156119b0223cf14d335ebda84701a69b2ba95757 Mon Sep 17 00:00:00 2001
|
||||
From: Mark H Weaver <mhw@netris.org>
|
||||
Date: Sat, 20 Sep 2014 03:49:46 -0400
|
||||
Subject: [PATCH] Do not assume that 64-bit integers will be 64-bit aligned.
|
||||
|
||||
--- libguile/foreign.c.orig Tue Jan 21 22:20:53 2014
|
||||
+++ libguile/foreign.c Fri Apr 17 06:56:07 2015
|
||||
@@ -1,4 +1,4 @@
|
||||
-/* Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
|
||||
+/* Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "pointer->proced
|
||||
|
||||
static const struct
|
||||
{
|
||||
- scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
|
||||
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
|
||||
const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8
|
||||
+ sizeof (struct scm_objcode) + 32)];
|
||||
} raw_bytecode = {
|
||||
@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int nargs)
|
||||
|
||||
static const struct
|
||||
{
|
||||
- scm_t_uint64 dummy; /* alignment */
|
||||
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
|
||||
scm_t_cell cells[10 * 2]; /* 10 double cells */
|
||||
} objcode_cells = {
|
||||
0,
|
||||
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-libguile_gsubr_c,v 1.1 2015/04/17 05:23:30 ajacoutot Exp $
|
||||
|
||||
From 156119b0223cf14d335ebda84701a69b2ba95757 Mon Sep 17 00:00:00 2001
|
||||
From: Mark H Weaver <mhw@netris.org>
|
||||
Date: Sat, 20 Sep 2014 03:49:46 -0400
|
||||
Subject: [PATCH] Do not assume that 64-bit integers will be 64-bit aligned.
|
||||
|
||||
--- libguile/gsubr.c.orig Mon Jul 2 11:28:13 2012
|
||||
+++ libguile/gsubr.c Fri Apr 17 06:56:07 2015
|
||||
@@ -1,4 +1,5 @@
|
||||
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
+/* Copyright (C) 1995-2001, 2006, 2008-2011,
|
||||
+ * 2014 Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public License
|
||||
@@ -213,7 +214,7 @@
|
||||
*/
|
||||
static const struct
|
||||
{
|
||||
- scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
|
||||
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
|
||||
const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16
|
||||
+ sizeof (struct scm_objcode) + 32)];
|
||||
} raw_bytecode = {
|
||||
@@ -317,7 +318,7 @@ static const struct
|
||||
|
||||
static const struct
|
||||
{
|
||||
- scm_t_uint64 dummy; /* alignment */
|
||||
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
|
||||
scm_t_cell cells[121 * 2]; /* 11*11 double cells */
|
||||
} objcode_cells = {
|
||||
0,
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/09/29 09:58:13 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2016/08/27 14:51:36 ajacoutot Exp $
|
||||
bin/guild
|
||||
@bin bin/guile2
|
||||
bin/guile2-config
|
||||
@ -116,6 +116,7 @@ include/guile/${V}/libguile/tags.h
|
||||
include/guile/${V}/libguile/threads.h
|
||||
include/guile/${V}/libguile/throw.h
|
||||
include/guile/${V}/libguile/trees.h
|
||||
include/guile/${V}/libguile/unicode.h
|
||||
include/guile/${V}/libguile/uniform.h
|
||||
include/guile/${V}/libguile/validate.h
|
||||
include/guile/${V}/libguile/values.h
|
||||
@ -198,6 +199,7 @@ lib/guile/${V}/ccache/ice-9/syncase.go
|
||||
lib/guile/${V}/ccache/ice-9/threads.go
|
||||
lib/guile/${V}/ccache/ice-9/time.go
|
||||
lib/guile/${V}/ccache/ice-9/top-repl.go
|
||||
lib/guile/${V}/ccache/ice-9/unicode.go
|
||||
lib/guile/${V}/ccache/ice-9/vlist.go
|
||||
lib/guile/${V}/ccache/ice-9/weak-vector.go
|
||||
lib/guile/${V}/ccache/language/
|
||||
@ -340,6 +342,7 @@ lib/guile/${V}/ccache/srfi/srfi-19.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-2.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-26.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-27.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-28.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-31.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-34.go
|
||||
lib/guile/${V}/ccache/srfi/srfi-35.go
|
||||
@ -428,7 +431,7 @@ lib/guile/${V}/ccache/web/uri.go
|
||||
lib/libguile-${V}.a
|
||||
lib/libguile-${V}.la
|
||||
@lib lib/libguile-${V}.so.${LIBguile-2.0_VERSION}
|
||||
lib/libguile-${V}.so.0.0-gdb.scm
|
||||
lib/libguile-${V}.so.0.1-gdb.scm
|
||||
lib/libguilereadline-v-18.a
|
||||
lib/libguilereadline-v-18.la
|
||||
@lib lib/libguilereadline-v-18.so.${LIBguilereadline-v-18_VERSION}
|
||||
@ -508,6 +511,7 @@ share/guile/${V}/ice-9/syncase.scm
|
||||
share/guile/${V}/ice-9/threads.scm
|
||||
share/guile/${V}/ice-9/time.scm
|
||||
share/guile/${V}/ice-9/top-repl.scm
|
||||
share/guile/${V}/ice-9/unicode.scm
|
||||
share/guile/${V}/ice-9/vlist.scm
|
||||
share/guile/${V}/ice-9/weak-vector.scm
|
||||
share/guile/${V}/language/
|
||||
@ -650,6 +654,7 @@ share/guile/${V}/srfi/srfi-19.scm
|
||||
share/guile/${V}/srfi/srfi-2.scm
|
||||
share/guile/${V}/srfi/srfi-26.scm
|
||||
share/guile/${V}/srfi/srfi-27.scm
|
||||
share/guile/${V}/srfi/srfi-28.scm
|
||||
share/guile/${V}/srfi/srfi-31.scm
|
||||
share/guile/${V}/srfi/srfi-34.scm
|
||||
share/guile/${V}/srfi/srfi-35.scm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user