[Midnightbsd-cvs] mports [21273] U trunk/lang/guile/files: fix guile build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 25 22:40:33 EDT 2016
Revision: 21273
http://svnweb.midnightbsd.org/mports/?rev=21273
Author: laffer1
Date: 2016-03-25 22:40:32 -0400 (Fri, 25 Mar 2016)
Log Message:
-----------
fix guile build
Modified Paths:
--------------
trunk/lang/guile/Makefile
trunk/lang/guile/files/patch-configure.in
trunk/lang/guile/files/patch-libguile_eval.c
trunk/lang/guile/files/patch-libguile_gc.c
trunk/lang/guile/files/patch-libguile_gen-scmconfig.c
trunk/lang/guile/files/patch-libguile_numbers.c
trunk/lang/guile/files/patch-libguile_pthread-threads.h
trunk/lang/guile/files/patch-libguile_read.c
trunk/lang/guile/files/patch-libguile_threads.c
Added Paths:
-----------
trunk/lang/guile/files/patch-doc__goops__goops.texi
trunk/lang/guile/files/patch-doc__r5rs__r5rs.texi
trunk/lang/guile/files/patch-doc__ref__fdl.texi
trunk/lang/guile/files/patch-doc__ref__gh.texi
trunk/lang/guile/files/patch-doc__tutorial__guile-tut.texi
trunk/lang/guile/files/patch-libguile_____scm.h
trunk/lang/guile/files/patch-libguile_c-tokenize.c
trunk/lang/guile/files/patch-libguile_gc__os__dep.c
trunk/lang/guile/files/patch-libguile_guile-snarf.in
Removed Paths:
-------------
trunk/lang/guile/files/patch-Makefile.am
trunk/lang/guile/files/patch-Makefile.in
trunk/lang/guile/files/patch-libguile___scm.h
trunk/lang/guile/files/patch-libguile_gc_os_dep.c
Property Changed:
----------------
trunk/lang/guile/files/patch-config.h.in
trunk/lang/guile/files/patch-configure.in
trunk/lang/guile/files/patch-libguile_eval.c
trunk/lang/guile/files/patch-libguile_gc.c
trunk/lang/guile/files/patch-libguile_gen-scmconfig.c
trunk/lang/guile/files/patch-libguile_numbers.c
trunk/lang/guile/files/patch-libguile_pthread-threads.h
trunk/lang/guile/files/patch-libguile_read.c
trunk/lang/guile/files/patch-libguile_threads.c
Modified: trunk/lang/guile/Makefile
===================================================================
--- trunk/lang/guile/Makefile 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/Makefile 2016-03-26 02:40:32 UTC (rev 21273)
@@ -2,15 +2,15 @@
PORTNAME= guile
PORTVERSION= 1.8.8
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= lang scheme
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= guile
+MASTER_SITES= GNU
MAINTAINER= ports at MidnightBSD.org
COMMENT= GNU Ubiquitous Intelligent Language for Extension
LICENSE= lgpl2.1
+LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
libgmp.so:${PORTSDIR}/math/gmp
@@ -17,8 +17,7 @@
CONFLICTS_INSTALL= guile2-[0-9]*
-USES= gmake libtool makeinfo ncurses pathfix
-USE_AUTOTOOLS= autoheader
+USES= autoreconf gmake libtool makeinfo ncurses pathfix
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CFLAGS+= -fwrapv
@@ -48,6 +47,7 @@
@cd ${WRKSRC} ; \
${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
@${REINPLACE_CMD} -e 's|2.68|${AUTOCONF_VERSION}|g' ${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|g' ${WRKSRC}/Makefile.am
@${TOUCH} ${WRKSRC}/Makefile.in
.include <bsd.port.mk>
Deleted: trunk/lang/guile/files/patch-Makefile.am
===================================================================
--- trunk/lang/guile/files/patch-Makefile.am 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-Makefile.am 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2008-12-08 10:42:52.000000000 -0700
-+++ Makefile.am 2009-02-22 15:46:17.000000000 -0700
-@@ -40,7 +40,7 @@
-
- DISTCLEANFILES = check-guile.log
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
- pkgconfig_DATA = guile-1.8.pc
-
- # Makefile.am ends here
Deleted: trunk/lang/guile/files/patch-Makefile.in
===================================================================
--- trunk/lang/guile/files/patch-Makefile.in 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-Makefile.in 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2008-07-09 15:28:14.000000000 +0800
-+++ Makefile.in 2008-07-09 15:29:13.000000000 +0800
-@@ -318,7 +318,7 @@
- TESTS = check-guile
- ACLOCAL_AMFLAGS = -I guile-config
- DISTCLEANFILES = check-guile.log
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = guile-1.8.pc
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
Index: trunk/lang/guile/files/patch-config.h.in
===================================================================
--- trunk/lang/guile/files/patch-config.h.in 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-config.h.in 2016-03-26 02:40:32 UTC (rev 21273)
Property changes on: trunk/lang/guile/files/patch-config.h.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/lang/guile/files/patch-configure.in
===================================================================
--- trunk/lang/guile/files/patch-configure.in 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-configure.in 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,6 +1,6 @@
---- configure.in.orig 2010-12-13 18:24:39.000000000 +0100
-+++ configure.in 2011-07-31 13:17:56.000000000 +0200
-@@ -659,7 +659,7 @@
+--- configure.in.orig 2010-12-13 17:24:39 UTC
++++ configure.in
+@@ -659,7 +659,7 @@ AC_SUBST([SCM_I_GSC_HAVE_STRUCT_DIRENT64
#
AC_CHECK_HEADERS([complex.h fenv.h io.h libc.h limits.h malloc.h memory.h process.h string.h \
regex.h rxposix.h rx/rxposix.h sys/dir.h sys/ioctl.h sys/select.h \
@@ -9,7 +9,7 @@
sys/utime.h time.h unistd.h utime.h pwd.h grp.h sys/utsname.h \
direct.h strings.h machine/fpu.h])
-@@ -762,6 +762,7 @@
+@@ -762,6 +762,7 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chs
# sys/param.h - not in mingw
# pthread.h - only available with pthreads. ACX_PTHREAD doesn't
# check this specifically, we need it for the timespec test below.
@@ -17,7 +17,7 @@
# sethostname - the function itself check because it's not in mingw,
# the DECL is checked because Solaris 10 doens't have in any header
# strncasecmp - on NetBSD 1.6 the symbol is available in libc but the
-@@ -779,7 +780,7 @@
+@@ -779,7 +780,7 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chs
# vsnprintf - on AIX 5.3, the declaration is only visible with
# `_XOPEN_SOURCE >= 500' or `_ISOC99_SOURCE'.
#
@@ -26,7 +26,7 @@
AC_CHECK_FUNCS(chroot flock getlogin cuserid getpriority setpriority getpass sethostname gethostname)
AC_CHECK_DECLS([sethostname, strncasecmp, unsetenv, hstrerror, cuserid, flock, vsnprintf])
-@@ -1298,9 +1299,11 @@
+@@ -1298,9 +1299,11 @@ case "$with_threads" in
# all; not present on MacOS X or Solaris 10
# pthread_get_stackaddr_np - "np" meaning "non portable" says it
# all; specific to MacOS X
@@ -39,7 +39,7 @@
# On past versions of Solaris, believe 8 through 10 at least, you
# had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };".
-@@ -1315,7 +1318,7 @@
+@@ -1315,7 +1318,7 @@ case "$with_threads" in
if test "$GCC" = "yes"; then
# Since GCC only issues a warning for missing braces, so we need
# `-Werror' to catch it.
@@ -48,7 +48,7 @@
fi
AC_CACHE_CHECK([whether PTHREAD_ONCE_INIT needs braces],
-@@ -1466,7 +1469,7 @@
+@@ -1466,7 +1469,7 @@ case "$GCC" in
# not be "warning free"
if test "${GUILE_ERROR_ON_WARNING}" = yes
then
Property changes on: trunk/lang/guile/files/patch-configure.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/lang/guile/files/patch-doc__goops__goops.texi
===================================================================
--- trunk/lang/guile/files/patch-doc__goops__goops.texi (rev 0)
+++ trunk/lang/guile/files/patch-doc__goops__goops.texi 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,11 @@
+--- doc/goops/goops.texi.orig 2010-12-13 17:24:39 UTC
++++ doc/goops/goops.texi
+@@ -131,7 +131,7 @@ info (goops.info) and texinfo format.
+ @end menu
+
+ @node Running GOOPS, Methods, Getting Started, Getting Started
+- at subsection Running GOOPS
++ at section Running GOOPS
+
+ @enumerate
+ @item
Property changes on: trunk/lang/guile/files/patch-doc__goops__goops.texi
___________________________________________________________________
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
Added: trunk/lang/guile/files/patch-doc__r5rs__r5rs.texi
===================================================================
--- trunk/lang/guile/files/patch-doc__r5rs__r5rs.texi (rev 0)
+++ trunk/lang/guile/files/patch-doc__r5rs__r5rs.texi 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,12 @@
+--- doc/r5rs/r5rs.texi.orig 2010-12-08 09:06:50 UTC
++++ doc/r5rs/r5rs.texi
+@@ -116,9 +116,6 @@
+
+
+
+- at unnumbered Summary
+-
+-
+ The report gives a defining description of the programming language
+ Scheme. Scheme is a statically scoped and properly tail-recursive
+ dialect of the Lisp programming language invented by Guy Lewis
Property changes on: trunk/lang/guile/files/patch-doc__r5rs__r5rs.texi
___________________________________________________________________
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
Added: trunk/lang/guile/files/patch-doc__ref__fdl.texi
===================================================================
--- trunk/lang/guile/files/patch-doc__ref__fdl.texi (rev 0)
+++ trunk/lang/guile/files/patch-doc__ref__fdl.texi 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,11 @@
+--- doc/ref/fdl.texi.orig 2010-12-13 17:24:39 UTC
++++ doc/ref/fdl.texi
+@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundat
+ @end enumerate
+
+ @page
+- at appendixsubsec ADDENDUM: How to use this License for your documents
++ at appendixsec ADDENDUM: How to use this License for your documents
+
+ To use this License in a document you have written, include a copy of
+ the License in the document and put the following copyright and
Property changes on: trunk/lang/guile/files/patch-doc__ref__fdl.texi
___________________________________________________________________
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
Added: trunk/lang/guile/files/patch-doc__ref__gh.texi
===================================================================
--- trunk/lang/guile/files/patch-doc__ref__gh.texi (rev 0)
+++ trunk/lang/guile/files/patch-doc__ref__gh.texi 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,11 @@
+--- doc/ref/gh.texi.orig 2010-12-13 17:24:39 UTC
++++ doc/ref/gh.texi
+@@ -995,8 +995,6 @@ These correspond to the Scheme @code{(co
+
+ @deftypefun SCM gh_car (SCM @var{obj})
+ @deftypefunx SCM gh_cdr (SCM @var{obj})
+- at dots{}
+-
+ @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
+ These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
+ @end deftypefun
Property changes on: trunk/lang/guile/files/patch-doc__ref__gh.texi
___________________________________________________________________
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
Added: trunk/lang/guile/files/patch-doc__tutorial__guile-tut.texi
===================================================================
--- trunk/lang/guile/files/patch-doc__tutorial__guile-tut.texi (rev 0)
+++ trunk/lang/guile/files/patch-doc__tutorial__guile-tut.texi 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,39 @@
+--- doc/tutorial/guile-tut.texi.orig 2010-12-13 17:24:39 UTC
++++ doc/tutorial/guile-tut.texi
+@@ -446,7 +446,7 @@ get started, look at the books @cite{Sim
+ Schemer} from that list.}
+
+
+- at subsection Hello World
++ at section Hello World
+ @cindex hello world
+
+ Our first program is the typical Scheme "hello world" program. Put the
+@@ -535,12 +535,12 @@ guile> @kbd{(memq 4 ls)}
+ guile> @kbd{(if (memq 4 ls)
+ (display "hey, it's true!\n")
+ (display "dude, it's false\n"))}
+- @print{hey, it's true!}
++ @print{} hey, it's true!
+ @result{}
+ guile> @kbd{(if (memq 12 ls)
+ (display "hey, it's true!\n")
+ (display "dude, it's false\n"))}
+- @print{dude, it's false}
++ @print{} dude, it's false
+ @result{}
+ guile> @kbd{(memq 4 (reverse ls))}
+ @result{} (4 3 2 1)
+@@ -656,9 +656,9 @@ And then invoke it with
+ (represent-matrix m
+ (lambda (x) (begin (display x) (display " ")))
+ (lambda (l) (begin (display "\n"))))
+- at print{7 2 1 3 2 8 5 3 6}
+- at print{4 1 1 1 3 8 9 8 1}
+- at print{5 5 4 8 1 8 2 2 4}
++ at print{} 7 2 1 3 2 8 5 3 6
++ at print{} 4 1 1 1 3 8 9 8 1
++ at print{} 5 5 4 8 1 8 2 2 4
+ @end smalllisp
+
+ @cindex objects
Property changes on: trunk/lang/guile/files/patch-doc__tutorial__guile-tut.texi
___________________________________________________________________
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
Added: trunk/lang/guile/files/patch-libguile_____scm.h
===================================================================
--- trunk/lang/guile/files/patch-libguile_____scm.h (rev 0)
+++ trunk/lang/guile/files/patch-libguile_____scm.h 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,12 @@
+--- libguile/__scm.h.orig 2010-12-13 17:25:01 UTC
++++ libguile/__scm.h
+@@ -434,7 +434,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 */
Property changes on: trunk/lang/guile/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/guile/files/patch-libguile___scm.h
===================================================================
--- trunk/lang/guile/files/patch-libguile___scm.h 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile___scm.h 2016-03-26 02:40:32 UTC (rev 21273)
@@ -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
-@@ -411,7 +411,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/guile/files/patch-libguile_c-tokenize.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_c-tokenize.c (rev 0)
+++ trunk/lang/guile/files/patch-libguile_c-tokenize.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,18 @@
+--- libguile/c-tokenize.c.orig 2010-12-13 19:24:04 UTC
++++ libguile/c-tokenize.c
+@@ -898,13 +898,13 @@ case 3:
+ /* rule 3 can match eol */
+ YY_RULE_SETUP
+ #line 71 "./c-tokenize.lex"
+-{ OUT(eol); }
++{ /*OUT(eol);*/ }
+ YY_BREAK
+ case 4:
+ /* rule 4 can match eol */
+ YY_RULE_SETUP
+ #line 73 "./c-tokenize.lex"
+-{ OUT(hash); IS_NOT_COOKIE; }
++{ /*OUT(hash);*/ IS_NOT_COOKIE; }
+ YY_BREAK
+ case 5:
+ YY_RULE_SETUP
Property changes on: trunk/lang/guile/files/patch-libguile_c-tokenize.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/guile/files/patch-libguile_eval.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_eval.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_eval.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,6 +1,6 @@
---- libguile/eval.c 2008-07-09 14:44:29.000000000 +0800
-+++ libguile/eval.c 2008-07-09 14:45:45.000000000 +0800
-@@ -42,6 +42,8 @@
+--- libguile/eval.c.orig 2010-12-13 17:24:39 UTC
++++ libguile/eval.c
+@@ -40,6 +40,8 @@
#ifndef alloca
# if HAVE_ALLOCA_H
# include <alloca.h>
Property changes on: trunk/lang/guile/files/patch-libguile_eval.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/guile/files/patch-libguile_gc.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_gc.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_gc.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,6 +1,6 @@
---- libguile/gc.c.orig 2008-12-08 09:42:54.000000000 -0800
-+++ libguile/gc.c 2009-08-20 22:55:11.000000000 -0700
-@@ -1060,6 +1060,20 @@
+--- libguile/gc.c.orig 2010-12-13 17:24:40 UTC
++++ libguile/gc.c
+@@ -1060,6 +1060,20 @@ scm_ia64_ar_bsp (const void *opaque)
return (void *) ctx->uc_mcontext.sc_ar_bsp;
}
# endif /* linux */
Property changes on: trunk/lang/guile/files/patch-libguile_gc.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/lang/guile/files/patch-libguile_gc__os__dep.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_gc__os__dep.c (rev 0)
+++ trunk/lang/guile/files/patch-libguile_gc__os__dep.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,168 @@
+--- libguile/gc_os_dep.c.orig 2010-12-13 17:25:01 UTC
++++ libguile/gc_os_dep.c
+@@ -115,6 +115,12 @@ typedef int GC_bool;
+ # define NETBSD
+ # define mach_type_known
+ # endif
++# if defined(__FreeBSD__) && defined(__sparc__)
++# define SPARC
++# define FREEBSD
++# include <machine/frame.h>
++# define mach_type_known
++# endif
+ # if defined(__NetBSD__) && defined(__powerpc__)
+ # define POWERPC
+ # define NETBSD
+@@ -249,7 +255,21 @@ typedef int GC_bool;
+ # define ARM32
+ # define mach_type_known
+ # endif
+-# if defined(__alpha) || defined(__alpha__)
++# if defined(__FreeBSD__) && defined(__ia64__)
++# define FREEBSD
++# define IA64
++# define mach_type_known
++# endif
++# if defined(__FreeBSD__) && defined(__amd64__)
++# define FREEBSD
++# define AMD64
++# define mach_type_known
++# endif
++# if defined(__FreeBSD__) && defined(__alpha__)
++# define FREEBSD
++# define ALPHA
++# define mach_type_known
++# elif defined(__alpha) || defined(__alpha__)
+ # define ALPHA
+ # if !defined(LINUX) && !defined (NETBSD)
+ # define OSF1 /* a.k.a Digital Unix */
+@@ -701,8 +721,6 @@ scm_get_stack_base ()
+
+ # ifdef SPARC
+ # define MACH_TYPE "SPARC"
+-# define ALIGNMENT 4 /* Required by hardware */
+-# define ALIGN_DOUBLE
+ extern int etext;
+ # ifdef SUNOS5
+ # define OS_TYPE "SUNOS5"
+@@ -757,7 +775,6 @@ scm_get_stack_base ()
+ # define DYNAMIC_LOADING
+ # endif
+ # ifdef DRSNX
+-# define CPP_WORDSZ 32
+ # define OS_TYPE "DRSNX"
+ extern char * GC_SysVGetDataStart();
+ extern int etext;
+@@ -1172,6 +1189,13 @@ scm_get_stack_base ()
+ # endif
+ # endif
+
++# ifdef AMD64
++# define MACH_TYPE "AMD64"
++# define ALIGN_DOUBLE
++# define ALIGNMENT 8
++# define USE_GENERIC_PUSH_REGS
++# endif
++
+ # ifdef IA64
+ # define MACH_TYPE "IA64"
+ # define ALIGN_DOUBLE
+@@ -1517,8 +1541,15 @@ scm_get_stack_base ()
+ # include <setjmp.h>
+ #endif
+
+-#ifdef FREEBSD
++#if defined(FREEBSD) && defined(I386)
+ # include <machine/trap.h>
++# define ALIGNMENT 4
++# define CPP_WORDSZ 32
++#endif
++
++#if defined(FREEBSD) && defined(SPARC)
++# define ALIGNMENT 8
++# define ALIGN_DOUBLE
+ #endif
+
+ #ifdef AMIGA
+@@ -1550,7 +1581,7 @@ scm_get_stack_base ()
+ #endif
+
+ #ifdef SUNOS5SIGS
+-# include <sys/siginfo.h>
++/*# include <sys/siginfo.h>*/
+ # undef setjmp
+ # undef longjmp
+ # define setjmp(env) sigsetjmp(env, 1)
+@@ -1729,11 +1760,13 @@ void *scm_get_stack_base()
+ /* static */ jmp_buf GC_jmp_buf;
+
+ /*ARGSUSED*/
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_fault_handler(sig)
+ int sig;
+ {
+ longjmp(GC_jmp_buf, 1);
+ }
++#endif
+
+ # ifdef __STDC__
+ typedef void (*handler)(int);
+@@ -1741,6 +1774,7 @@ void *scm_get_stack_base()
+ typedef void (*handler)();
+ # endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+ static struct sigaction old_segv_act;
+ # if defined(_sigargs) || defined(HPUX) /* !Irix6.x */
+@@ -1749,7 +1783,9 @@ void *scm_get_stack_base()
+ # else
+ static handler old_segv_handler, old_bus_handler;
+ # endif
++#endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_setup_temporary_fault_handler()
+ {
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+@@ -1786,7 +1822,9 @@ void *scm_get_stack_base()
+ # endif
+ # endif
+ }
++#endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_reset_fault_handler()
+ {
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+@@ -1802,8 +1840,10 @@ void *scm_get_stack_base()
+ # endif
+ # endif
+ }
++#endif
+
+ /* Single argument version, robust against whole program analysis. */
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void
+ GC_noop1(x)
+ word x;
+@@ -1811,9 +1851,11 @@ void *scm_get_stack_base()
+ static VOLATILE word sink;
+ sink = x;
+ }
++#endif
+
+ /* Return the first nonaddressible location > p (up) or */
+ /* the smallest location q s.t. [q,p] is addressible (!up). */
++#if !(defined(FREEBSD) && defined(SPARC))
+ static ptr_t GC_find_limit(p, up)
+ ptr_t p;
+ GC_bool up;
+@@ -1844,6 +1886,7 @@ void *scm_get_stack_base()
+ }
+ return(result);
+ }
++#endif
+
+ # endif
+
Property changes on: trunk/lang/guile/files/patch-libguile_gc__os__dep.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
Deleted: trunk/lang/guile/files/patch-libguile_gc_os_dep.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_gc_os_dep.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_gc_os_dep.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,168 +0,0 @@
---- libguile/gc_os_dep.c.orig 2008-02-16 19:50:24.000000000 +0100
-+++ libguile/gc_os_dep.c 2008-03-06 16:21:40.000000000 +0100
-@@ -115,6 +115,12 @@
- # define NETBSD
- # define mach_type_known
- # endif
-+# if defined(__FreeBSD__) && defined(__sparc__)
-+# define SPARC
-+# define FREEBSD
-+# include <machine/frame.h>
-+# define mach_type_known
-+# endif
- # if defined(__NetBSD__) && defined(__powerpc__)
- # define POWERPC
- # define NETBSD
-@@ -249,7 +255,21 @@
- # define ARM32
- # define mach_type_known
- # endif
--# if defined(__alpha) || defined(__alpha__)
-+# if defined(__FreeBSD__) && defined(__ia64__)
-+# define FREEBSD
-+# define IA64
-+# define mach_type_known
-+# endif
-+# if defined(__FreeBSD__) && defined(__amd64__)
-+# define FREEBSD
-+# define AMD64
-+# define mach_type_known
-+# endif
-+# if defined(__FreeBSD__) && defined(__alpha__)
-+# define FREEBSD
-+# define ALPHA
-+# define mach_type_known
-+# elif defined(__alpha) || defined(__alpha__)
- # define ALPHA
- # if !defined(LINUX) && !defined (NETBSD)
- # define OSF1 /* a.k.a Digital Unix */
-@@ -701,8 +721,6 @@
-
- # ifdef SPARC
- # define MACH_TYPE "SPARC"
--# define ALIGNMENT 4 /* Required by hardware */
--# define ALIGN_DOUBLE
- extern int etext;
- # ifdef SUNOS5
- # define OS_TYPE "SUNOS5"
-@@ -750,7 +768,6 @@
- # define DYNAMIC_LOADING
- # endif
- # ifdef DRSNX
--# define CPP_WORDSZ 32
- # define OS_TYPE "DRSNX"
- extern char * GC_SysVGetDataStart();
- extern int etext;
-@@ -1159,6 +1176,13 @@
- # endif
- # endif
-
-+# ifdef AMD64
-+# define MACH_TYPE "AMD64"
-+# define ALIGN_DOUBLE
-+# define ALIGNMENT 8
-+# define USE_GENERIC_PUSH_REGS
-+# endif
-+
- # ifdef IA64
- # define MACH_TYPE "IA64"
- # define ALIGN_DOUBLE
-@@ -1504,8 +1528,15 @@
- # include <setjmp.h>
- #endif
-
--#ifdef FREEBSD
-+#if defined(FREEBSD) && defined(I386)
- # include <machine/trap.h>
-+# define ALIGNMENT 4
-+# define CPP_WORDSZ 32
-+#endif
-+
-+#if defined(FREEBSD) && defined(SPARC)
-+# define ALIGNMENT 8
-+# define ALIGN_DOUBLE
- #endif
-
- #ifdef AMIGA
-@@ -1537,7 +1568,7 @@
- #endif
-
- #ifdef SUNOS5SIGS
--# include <sys/siginfo.h>
-+/*# include <sys/siginfo.h>*/
- # undef setjmp
- # undef longjmp
- # define setjmp(env) sigsetjmp(env, 1)
-@@ -1716,11 +1747,13 @@
- /* static */ jmp_buf GC_jmp_buf;
-
- /*ARGSUSED*/
-+#if !(defined(FREEBSD) && defined(SPARC))
- static void GC_fault_handler(sig)
- int sig;
- {
- longjmp(GC_jmp_buf, 1);
- }
-+#endif
-
- # ifdef __STDC__
- typedef void (*handler)(int);
-@@ -1728,6 +1761,7 @@
- typedef void (*handler)();
- # endif
-
-+#if !(defined(FREEBSD) && defined(SPARC))
- # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
- static struct sigaction old_segv_act;
- # if defined(_sigargs) || defined(HPUX) /* !Irix6.x */
-@@ -1736,7 +1770,9 @@
- # else
- static handler old_segv_handler, old_bus_handler;
- # endif
-+#endif
-
-+#if !(defined(FREEBSD) && defined(SPARC))
- static void GC_setup_temporary_fault_handler()
- {
- # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
-@@ -1773,7 +1809,9 @@
- # endif
- # endif
- }
-+#endif
-
-+#if !(defined(FREEBSD) && defined(SPARC))
- static void GC_reset_fault_handler()
- {
- # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
-@@ -1789,8 +1827,10 @@
- # endif
- # endif
- }
-+#endif
-
- /* Single argument version, robust against whole program analysis. */
-+#if !(defined(FREEBSD) && defined(SPARC))
- static void
- GC_noop1(x)
- word x;
-@@ -1798,9 +1838,11 @@
- static VOLATILE word sink;
- sink = x;
- }
-+#endif
-
- /* Return the first nonaddressible location > p (up) or */
- /* the smallest location q s.t. [q,p] is addressible (!up). */
-+#if !(defined(FREEBSD) && defined(SPARC))
- static ptr_t GC_find_limit(p, up)
- ptr_t p;
- GC_bool up;
-@@ -1831,6 +1873,7 @@
- }
- return(result);
- }
-+#endif
-
- # endif
-
Modified: trunk/lang/guile/files/patch-libguile_gen-scmconfig.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_gen-scmconfig.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_gen-scmconfig.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -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
+--- libguile/gen-scmconfig.c.orig 2010-12-13 17:25:01 UTC
++++ libguile/gen-scmconfig.c
@@ -123,6 +123,7 @@
- #include "gen-scmconfig.h"
+ #include <libguile/gen-scmconfig.h>
+#define _ANSI_SOURCE
#include <stdio.h>
Property changes on: trunk/lang/guile/files/patch-libguile_gen-scmconfig.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/lang/guile/files/patch-libguile_guile-snarf.in
===================================================================
--- trunk/lang/guile/files/patch-libguile_guile-snarf.in (rev 0)
+++ trunk/lang/guile/files/patch-libguile_guile-snarf.in 2016-03-26 02:40:32 UTC (rev 21273)
@@ -0,0 +1,12 @@
+--- libguile/guile-snarf.in.orig 2010-12-13 17:24:40 UTC
++++ libguile/guile-snarf.in
+@@ -51,7 +51,8 @@ modern_snarf ()
+ ## empty file.
+ echo "/* cpp arguments: $@ */" ;
+ ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+- grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
++ sed -e 's/\^ *\^/\
++^^/g' ${temp} | grep "^.*\^ *\^" | sed -e "s/^.*\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+
+ ## main
Property changes on: trunk/lang/guile/files/patch-libguile_guile-snarf.in
___________________________________________________________________
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/guile/files/patch-libguile_numbers.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_numbers.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_numbers.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,6 +1,6 @@
---- libguile/numbers.c 2008-07-09 14:50:22.000000000 +0800
-+++ libguile/numbers.c 2008-07-09 14:53:05.000000000 +0800
-@@ -163,7 +163,7 @@
+--- libguile/numbers.c.orig 2010-12-13 17:25:01 UTC
++++ libguile/numbers.c
+@@ -160,7 +160,7 @@ xisnan (double x)
}
#if defined (GUILE_I)
Property changes on: trunk/lang/guile/files/patch-libguile_numbers.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/guile/files/patch-libguile_pthread-threads.h
===================================================================
--- trunk/lang/guile/files/patch-libguile_pthread-threads.h 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_pthread-threads.h 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,5 +1,5 @@
---- libguile/pthread-threads.h 2008-02-27 10:31:41.564950412 -0600
-+++ libguile/pthread-threads.h 2008-02-27 10:36:08.383652510 -0600
+--- libguile/pthread-threads.h.orig 2010-12-13 17:24:40 UTC
++++ libguile/pthread-threads.h
@@ -26,6 +26,9 @@
*/
Property changes on: trunk/lang/guile/files/patch-libguile_pthread-threads.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/lang/guile/files/patch-libguile_read.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_read.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_read.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,5 +1,5 @@
---- libguile/read.c 2008-02-23 18:05:20.175715735 -0600
-+++ libguile/read.c 2008-02-23 18:06:27.495397147 -0600
+--- libguile/read.c.orig 2010-12-13 17:24:40 UTC
++++ libguile/read.c
@@ -27,7 +27,7 @@
#include <ctype.h>
#include <string.h>
Property changes on: trunk/lang/guile/files/patch-libguile_read.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/lang/guile/files/patch-libguile_threads.c
===================================================================
--- trunk/lang/guile/files/patch-libguile_threads.c 2016-03-26 02:33:03 UTC (rev 21272)
+++ trunk/lang/guile/files/patch-libguile_threads.c 2016-03-26 02:40:32 UTC (rev 21273)
@@ -1,6 +1,6 @@
---- libguile/threads.c 2008-02-27 10:17:41.531443640 -0600
-+++ libguile/threads.c 2008-02-27 10:25:44.309334685 -0600
-@@ -593,7 +593,7 @@
+--- libguile/threads.c.orig 2010-12-13 17:24:40 UTC
++++ libguile/threads.c
+@@ -631,7 +631,7 @@ scm_i_init_thread_for_guile (SCM_STACKIT
#if SCM_USE_PTHREAD_THREADS
@@ -9,7 +9,7 @@
/* This method for GNU/Linux and perhaps some other systems.
It's not for MacOS X or Solaris 10, since pthread_getattr_np is not
available on them. */
-@@ -606,8 +606,15 @@
+@@ -644,8 +644,15 @@ get_thread_stack_base ()
void *start, *end;
size_t size;
Property changes on: trunk/lang/guile/files/patch-libguile_threads.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list