[Midnightbsd-cvs] mports [24299] trunk/lang/guile2: update and fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 10 08:41:59 EDT 2018 

Revision: 24299
          http://svnweb.midnightbsd.org/mports/?rev=24299
Author:   laffer1
Date:     2018-09-10 08:41:56 -0400 (Mon, 10 Sep 2018)
Log Message:
-----------
update and fix build

Modified Paths:
--------------
    trunk/lang/guile2/Makefile
    trunk/lang/guile2/distinfo
    trunk/lang/guile2/files/patch-libguile_gen-scmconfig.c
    trunk/lang/guile2/files/patch-libguile_numbers.c
    trunk/lang/guile2/files/patch-libguile_pthread-threads.h
    trunk/lang/guile2/pkg-descr
    trunk/lang/guile2/pkg-plist

Added Paths:
-----------
    trunk/lang/guile2/files/patch-libguile_____scm.h
    trunk/lang/guile2/files/patch-libguile_filesys.c

Removed Paths:
-------------
    trunk/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
    trunk/lang/guile2/files/patch-libguile___scm.h

Modified: trunk/lang/guile2/Makefile
===================================================================
--- trunk/lang/guile2/Makefile	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/Makefile	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,7 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	guile
-PORTVERSION=	2.0.11
+PORTVERSION=	2.0.14
+PORTREVISION=	4
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	2
@@ -11,14 +12,19 @@
 
 LICENSE=	lgpl2.1
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libunistring.so:${PORTSDIR}/devel/libunistring \
-		libffi.so.6:${PORTSDIR}/devel/libffi
+BROKEN_mips64=		fails to build: qemu: uncaught target signal 11 (Segmentation fault) - core dumped
 
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libltdl.so:devel/libltdl \
+		libunistring.so:devel/libunistring \
+		libffi.so:devel/libffi
+
 CONFLICTS_INSTALL=	guile-[0-9]*
 
-USES=		charsetfix gmake libtool ncurses pathfix pkgconfig readline
+MAKE_JOBS_UNSAFE=	yes
+
+USES=		charsetfix gmake libtool makeinfo ncurses pathfix pkgconfig \
+		readline
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -25,32 +31,32 @@
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+INFO=		guile r5rs
+
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	NLS THREADS
 OPTIONS_DEFAULT=THREADS
 OPTIONS_SUB=	yes
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
+
 THREADS_CONFIGURE_WITH=	threads
-THREADS_LIB_DEPENDS=	libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
-THREADS_LIB_DEPENDS_OFF=	libgc.so:${PORTSDIR}/devel/boehm-gc
+THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
+THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 
 REINPLACE_FILES=	libguile/smob.c libguile/filesys.c libguile/gc.c \
-			libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
-			libguile/ports.c
+			libguile/mallocs.c libguile/eval.c \
+			libguile/gc-malloc.c libguile/ports.c
 
-INFO=		guile r5rs
-
-.include <bsd.mport.options.mk>
-
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
 	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \
 		${WRKSRC}/configure
-.if ${PORT_OPTIONS:MTHREADS}
+
+post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
-.endif
 
 .include <bsd.port.mk>

Modified: trunk/lang/guile2/distinfo
===================================================================
--- trunk/lang/guile2/distinfo	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/distinfo	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,2 +1,3 @@
-SHA256 (guile-2.0.11.tar.gz) = e6786c934346fa2e38e46d8d81a622bb1c16d130153523f6129fcd79ef1fb040
-SIZE (guile-2.0.11.tar.gz) = 7516053
+TIMESTAMP = 1487980204
+SHA256 (guile-2.0.14.tar.gz) = 8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1
+SIZE (guile-2.0.14.tar.gz) = 7823099

Deleted: trunk/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757
===================================================================
--- trunk/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/files/patch-156119b0223cf14d335ebda84701a69b2ba95757	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,62 +0,0 @@
-From 156119b0223cf14d335ebda84701a69b2ba95757 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw at 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 (raw_bytecode, objcode_cells):
-* libguile/gsubr.c (raw_bytecode, objcode_cells): Use SCM_ALIGNED to
-  ensure 64-bit alignment.
-
---- libguile/foreign.c.orig	2014-01-21 21:20:53 UTC
-+++ libguile/foreign.c
-@@ -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, "p
- 
- 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 na
- 
- 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,
---- libguile/gsubr.c.orig	2012-07-02 09:28:13 UTC
-+++ libguile/gsubr.c
-@@ -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,

Added: trunk/lang/guile2/files/patch-libguile_____scm.h
===================================================================
--- trunk/lang/guile2/files/patch-libguile_____scm.h	                        (rev 0)
+++ trunk/lang/guile2/files/patch-libguile_____scm.h	2018-09-10 12:41:56 UTC (rev 24299)
@@ -0,0 +1,12 @@
+--- libguile/__scm.h.orig	2014-01-21 21:25:11 UTC
++++ libguile/__scm.h
+@@ -544,7 +544,8 @@ typedef void *scm_t_subr;
+  * that all the state of the process is contained in the stack.
+  */
+ 
+-#if defined (sparc) || defined (__sparc__) || defined (__sparc)
++#if (defined (sparc) || defined (__sparc__) || defined (__sparc)) && \
++	    defined(__FreeBSD__)
+ # define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3")
+ #else
+ # define SCM_FLUSH_REGISTER_WINDOWS /* empty */


Property changes on: trunk/lang/guile2/files/patch-libguile_____scm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/lang/guile2/files/patch-libguile___scm.h
===================================================================
--- trunk/lang/guile2/files/patch-libguile___scm.h	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/files/patch-libguile___scm.h	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,12 +0,0 @@
---- libguile/__scm.h	2008-02-23 18:14:28.106264450 -0600
-+++ libguile/__scm.h	2008-02-23 18:15:41.306005478 -0600
-@@ -544,7 +544,8 @@
-  * that all the state of the process is contained in the stack.
-  */
- 
--#if defined (sparc) || defined (__sparc__) || defined (__sparc)
-+#if (defined (sparc) || defined (__sparc__) || defined (__sparc)) && \
-+	    defined(__FreeBSD__)
- # define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3")
- #else
- # define SCM_FLUSH_REGISTER_WINDOWS /* empty */

Added: trunk/lang/guile2/files/patch-libguile_filesys.c
===================================================================
--- trunk/lang/guile2/files/patch-libguile_filesys.c	                        (rev 0)
+++ trunk/lang/guile2/files/patch-libguile_filesys.c	2018-09-10 12:41:56 UTC (rev 24299)
@@ -0,0 +1,12 @@
+--- libguile/filesys.c.orig	2017-02-06 04:37:29 UTC
++++ libguile/filesys.c
+@@ -1486,6 +1486,9 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1
+       mode_bits = scm_i_mode_bits (mode);
+     }
+ 
++#ifdef __FreeBSD__
++  open_flags &= O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
++#endif
+   SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
+   if (rv == -1)
+     SCM_SYSERROR;


Property changes on: trunk/lang/guile2/files/patch-libguile_filesys.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/lang/guile2/files/patch-libguile_gen-scmconfig.c
===================================================================
--- trunk/lang/guile2/files/patch-libguile_gen-scmconfig.c	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/files/patch-libguile_gen-scmconfig.c	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,8 +1,8 @@
---- libguile/gen-scmconfig.c	2008-02-23 21:38:39.310330888 -0600
-+++ libguile/gen-scmconfig.c	2008-02-23 21:39:32.909873567 -0600
-@@ -123,6 +123,7 @@
+--- libguile/gen-scmconfig.c.orig	2014-03-16 22:43:13 UTC
++++ libguile/gen-scmconfig.c
+@@ -138,6 +138,7 @@
  
- #include "gen-scmconfig.h"
+ #include <libguile/gen-scmconfig.h>
  
 +#define _ANSI_SOURCE
  #include <stdio.h>

Modified: trunk/lang/guile2/files/patch-libguile_numbers.c
===================================================================
--- trunk/lang/guile2/files/patch-libguile_numbers.c	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/files/patch-libguile_numbers.c	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,8 +1,20 @@
---- libguile/numbers.c	2008-07-09 14:50:22.000000000 +0800
-+++ libguile/numbers.c	2008-07-09 14:53:05.000000000 +0800
-@@ -183,7 +183,7 @@
+--- libguile/numbers.c.orig	2016-12-15 00:03:33 UTC
++++ libguile/numbers.c
+@@ -45,7 +45,11 @@
+ #  include <config.h>
+ #endif
  
++/* With old GCC, do not override _Static_assert: it conflicts with
++   #include <complex.h> below. */
++#if defined(__clang__) || (__GNUC__ * 10 + __GNUC_MINOR__ >= 46)
+ #include <verify.h>
++#endif
+ #include <assert.h>
  
+ #include <math.h>
+@@ -183,7 +187,7 @@ static double atanh (double x) { return 0.5 * log ((1 
+ 
+ 
  #if defined (GUILE_I)
 -#if defined HAVE_COMPLEX_DOUBLE
 +#if defined HAVE_COMPLEX_DOUBLE && (HAVE_CLOG || HAVE_CLOG10 || HAVE_CEXP || HAVE_USABLE_CSQRT) && defined (SCM_COMPLEX_VALUE)

Modified: trunk/lang/guile2/files/patch-libguile_pthread-threads.h
===================================================================
--- trunk/lang/guile2/files/patch-libguile_pthread-threads.h	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/files/patch-libguile_pthread-threads.h	2018-09-10 12:41:56 UTC (rev 24299)
@@ -1,6 +1,6 @@
---- libguile/pthread-threads.h	2008-02-27 10:31:41.564950412 -0600
-+++ libguile/pthread-threads.h	2008-02-27 10:36:08.383652510 -0600
-@@ -26,6 +26,9 @@
+--- libguile/pthread-threads.h.orig	2012-07-02 09:28:13 UTC
++++ libguile/pthread-threads.h
+@@ -27,6 +27,9 @@
  */
  
  #include <pthread.h>
@@ -9,4 +9,4 @@
 +#endif
  #include <sched.h>
  
- /* Threads 
+ /* `libgc' defines wrapper procedures for pthread calls.  */

Modified: trunk/lang/guile2/pkg-descr
===================================================================
--- trunk/lang/guile2/pkg-descr	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/pkg-descr	2018-09-10 12:41:56 UTC (rev 24299)
@@ -2,7 +2,7 @@
 is a library that implements the Scheme language plus various
 convenient facilities. It's designed so that you can link it
 into an application or utility to make it extensible.  Our
-plan is to link this library into all GNU programs that call for 
+plan is to link this library into all GNU programs that call for
 extensibility.
 
 WWW: http://www.gnu.org/software/guile/

Modified: trunk/lang/guile2/pkg-plist
===================================================================
--- trunk/lang/guile2/pkg-plist	2018-09-09 22:37:47 UTC (rev 24298)
+++ trunk/lang/guile2/pkg-plist	2018-09-10 12:41:56 UTC (rev 24299)
@@ -113,6 +113,7 @@
 include/guile/%%GUILE_VER%%/libguile/threads.h
 include/guile/%%GUILE_VER%%/libguile/throw.h
 include/guile/%%GUILE_VER%%/libguile/trees.h
+include/guile/%%GUILE_VER%%/libguile/unicode.h
 include/guile/%%GUILE_VER%%/libguile/uniform.h
 include/guile/%%GUILE_VER%%/libguile/validate.h
 include/guile/%%GUILE_VER%%/libguile/values.h
@@ -127,8 +128,8 @@
 lib/libguile-%%GUILE_VER%%.a
 lib/libguile-%%GUILE_VER%%.so
 lib/libguile-%%GUILE_VER%%.so.22
-lib/libguile-%%GUILE_VER%%.so.22.7.2
-lib/libguile-%%GUILE_VER%%.so.22.7.2-gdb.scm
+lib/libguile-%%GUILE_VER%%.so.22.8.1
+lib/libguile-%%GUILE_VER%%.so.22.8.1-gdb.scm
 lib/libguilereadline-v-18.a
 lib/libguilereadline-v-18.so
 lib/libguilereadline-v-18.so.18
@@ -201,6 +202,7 @@
 lib/guile/%%GUILE_VER%%/ccache/ice-9/threads.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/time.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/top-repl.go
+lib/guile/%%GUILE_VER%%/ccache/ice-9/unicode.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/vlist.go
 lib/guile/%%GUILE_VER%%/ccache/ice-9/weak-vector.go
 lib/guile/%%GUILE_VER%%/ccache/language/assembly.go
@@ -322,6 +324,7 @@
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-2.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-26.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-27.go
+lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-28.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-31.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-34.go
 lib/guile/%%GUILE_VER%%/ccache/srfi/srfi-35.go
@@ -470,6 +473,7 @@
 %%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/top-repl.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/unicode.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/vlist.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm
 %%DATADIR%%/%%GUILE_VER%%/language/assembly.scm
@@ -591,6 +595,7 @@
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-2.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-26.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-27.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-28.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-31.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-34.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-35.scm

More information about the Midnightbsd-cvs mailing list