head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.5.2.1 OPENPKG_E1_FP:1.5.2.1 OPENPKG_2_STABLE_MP:1.6 OPENPKG_2_STABLE_20061018:1.5.2.1 OPENPKG_2_STABLE_20060622:1.5 OPENPKG_2_STABLE:1.5.0.2 OPENPKG_2_STABLE_BP:1.5 OPENPKG_2_5_RELEASE:1.3.6.1 OPENPKG_2_5_SOLID:1.3.0.6 OPENPKG_2_5_SOLID_BP:1.3 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.4 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_CW_FP:1.3 OPENPKG_2_3_RELEASE:1.3 OPENPKG_2_3_SOLID:1.3.0.2 OPENPKG_2_3_SOLID_BP:1.3 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.2 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.1 OPENPKG_2_1_SOLID:1.1.0.4 OPENPKG_2_1_SOLID_BP:1.1 OPENPKG_2_0_RELEASE:1.1 OPENPKG_2_0_SOLID:1.1.0.2 OPENPKG_2_0_SOLID_BP:1.1; locks; strict; comment @# @; 1.8 date 2008.12.09.10.39.16; author rse; state Exp; branches; next 1.7; commitid owjDjNkGZ17hoMtt; 1.7 date 2006.12.19.07.47.30; author rse; state Exp; branches; next 1.6; commitid z4k1B2HmbIgeC6Zr; 1.6 date 2006.10.09.06.02.06; author rse; state Exp; branches; next 1.5; commitid XXeOHW16Y1eyjYPr; 1.5 date 2006.05.18.07.19.31; author rse; state Exp; branches 1.5.2.1; next 1.4; commitid Q0b8ecbcSPN6ntxr; 1.4 date 2005.10.14.13.54.21; author rse; state Exp; branches; next 1.3; 1.3 date 2004.11.29.19.06.21; author rse; state Exp; branches 1.3.6.1; next 1.2; 1.2 date 2004.10.06.18.18.44; author rse; state Exp; branches; next 1.1; 1.1 date 2003.08.01.15.25.29; author mlelstv; state Exp; branches; next ; 1.5.2.1 date 2006.10.16.14.50.48; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.3.6.1 date 2005.10.14.13.56.04; author rse; state Exp; branches; next ; desc @@ 1.8 log @upgrading package: guile 1.8.5 -> 1.8.6 @ text @Index: configure --- configure.orig 2008-12-08 18:49:13 +0100 +++ configure 2008-12-09 08:30:04 +0100 @@@@ -33479,6 +33479,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include int main () { Index: libguile/__scm.h --- libguile/__scm.h.orig 2008-12-08 18:42:53 +0100 +++ libguile/__scm.h 2008-12-09 08:30:04 +0100 @@@@ -427,7 +427,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 */ Index: libguile/filesys.c --- libguile/filesys.c.orig 2008-12-08 18:42:54 +0100 +++ libguile/filesys.c 2008-12-09 08:30:04 +0100 @@@@ -883,7 +883,7 @@@@ if (!SCM_DIR_OPEN_P (port)) SCM_MISC_ERROR ("Directory ~S is not open.", scm_list_1 (port)); -#if HAVE_READDIR_R +#if defined(HAVE_READDIR_R) && defined(__linux__) /* As noted in the glibc manual, on various systems (such as Solaris) the d_name[] field is only 1 char and you're expected to size the dirent buffer for readdir_r based on NAME_MAX. The SCM_MAX expressions below Index: libguile/gc_os_dep.c --- libguile/gc_os_dep.c.orig 2008-12-04 19:30:41 +0100 +++ libguile/gc_os_dep.c 2008-12-09 08:30:04 +0100 @@@@ -115,6 +115,14 @@@@ # define NETBSD # define mach_type_known # endif +# if defined(__FreeBSD__) && defined(__sparc__) +# define FREEBSD +# include +# define ALIGNMENT 8 +# define CPP_WORDSZ 64 +# define ALIGN_DOUBLE +# define mach_type_known +# endif # if defined(__NetBSD__) && defined(__powerpc__) # define POWERPC # define NETBSD @@@@ -249,7 +257,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 */ @@@@ -1158,6 +1180,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 @@@@ -1503,7 +1532,7 @@@@ # include #endif -#ifdef FREEBSD +#if defined(FREEBSD) && defined(I386) # include #endif @ 1.7 log @add the full-size FreeBSD patches for the GC @ text @d2 3 a4 3 --- configure.orig 2006-10-07 05:54:24 +0200 +++ configure 2006-12-19 08:31:30 +0100 @@@@ -38902,6 +38902,7 @@@@ d13 3 a15 3 --- libguile/__scm.h.orig 2006-02-18 07:08:44 +0100 +++ libguile/__scm.h 2006-12-19 08:31:30 +0100 @@@@ -421,7 +421,8 @@@@ d26 3 a28 3 --- libguile/filesys.c.orig 2006-10-04 05:35:07 +0200 +++ libguile/filesys.c 2006-12-19 08:31:30 +0100 @@@@ -881,7 +881,7 @@@@ d38 4 a41 4 --- libguile/gc_os_dep.c.orig 2006-04-16 01:34:26 +0200 +++ libguile/gc_os_dep.c 2006-12-19 08:31:30 +0100 @@@@ -110,6 +110,14 @@@@ # define OPENBSD d55 1 a55 1 @@@@ -244,7 +252,21 @@@@ d76 1 a76 1 # if !defined(LINUX) d78 1 a78 1 @@@@ -1154,6 +1176,13 @@@@ d92 1 a92 1 @@@@ -1499,7 +1528,7 @@@@ a100 12 Index: libguile/guile.c --- libguile/guile.c.orig 2006-02-18 07:08:45 +0100 +++ libguile/guile.c 2006-12-19 08:31:30 +0100 @@@@ -68,7 +68,7 @@@@ { #if !defined (__MINGW32__) /* libtool automagically inserts this variable into your executable... */ - extern const lt_dlsymlist lt_preloaded_symbols[]; + extern const lt_dlsymlist *lt_preloaded_symbols; lt_dlpreload_default (lt_preloaded_symbols); #endif scm_boot_guile (argc, argv, inner_main, 0); @ 1.6 log @upgrading package: guile 1.8.0 -> 1.8.1 @ text @d3 1 a3 1 +++ configure 2006-10-08 10:51:50 +0200 d14 1 a14 1 +++ libguile/__scm.h 2006-10-08 10:51:50 +0200 d27 1 a27 1 +++ libguile/filesys.c 2006-10-08 10:54:00 +0200 d39 1 a39 1 +++ libguile/gc_os_dep.c 2006-10-08 10:51:50 +0200 d55 1 a55 1 @@@@ -244,7 +252,11 @@@@ d60 10 d78 15 a92 1 @@@@ -1499,7 +1511,7 @@@@ d103 1 a103 1 +++ libguile/guile.c 2006-10-08 10:51:50 +0200 @ 1.5 log @upgrading package: guile 1.6.7 -> 1.8.0 @ text @d1 11 d13 2 a14 2 --- libguile/__scm.h.orig 2006-02-12 14:29:11 +0100 +++ libguile/__scm.h 2006-03-10 12:34:42 +0100 d25 15 a39 2 --- libguile/gc_os_dep.c.orig 2006-02-12 14:29:12 +0100 +++ libguile/gc_os_dep.c 2006-03-10 12:34:42 +0100 d68 1 a68 1 @@@@ -1498,7 +1510,7 @@@@ d77 3 a79 2 --- libguile/guile.c.orig 2006-02-12 14:29:12 +0100 +++ libguile/guile.c 2006-03-10 12:35:41 +0100 a88 22 --- configure.orig 2006-02-20 22:29:46 +0100 +++ configure 2006-05-18 08:48:15 +0200 @@@@ -31401,6 +31401,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include int main () { Index: libguile/filesys.c --- libguile/filesys.c.orig 2006-02-12 14:29:11.000000000 +0100 +++ libguile/filesys.c 2006-05-18 09:04:12.766678995 +0200 @@@@ -849,7 +849,7 @@@@ errno = 0; { -#if HAVE_READDIR_R +#if defined(HAVE_READDIR_R) && defined(__linux__) /* On Solaris 2.7, struct dirent only contains "char d_name[1]" and one is expected to provide a buffer of "sizeof(struct dirent) + NAME_MAX" bytes. The glibc 2.3.2 manual notes this sort of thing too, and @ 1.5.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 11 Index: configure --- configure.orig 2006-10-07 05:54:24 +0200 +++ configure 2006-10-08 10:51:50 +0200 @@@@ -38902,6 +38902,7 @@@@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +#include int main () { d2 2 a3 2 --- libguile/__scm.h.orig 2006-02-18 07:08:44 +0100 +++ libguile/__scm.h 2006-10-08 10:51:50 +0200 d14 2 a15 15 Index: libguile/filesys.c --- libguile/filesys.c.orig 2006-10-04 05:35:07 +0200 +++ libguile/filesys.c 2006-10-08 10:54:00 +0200 @@@@ -881,7 +881,7 @@@@ if (!SCM_DIR_OPEN_P (port)) SCM_MISC_ERROR ("Directory ~S is not open.", scm_list_1 (port)); -#if HAVE_READDIR_R +#if defined(HAVE_READDIR_R) && defined(__linux__) /* As noted in the glibc manual, on various systems (such as Solaris) the d_name[] field is only 1 char and you're expected to size the dirent buffer for readdir_r based on NAME_MAX. The SCM_MAX expressions below Index: libguile/gc_os_dep.c --- libguile/gc_os_dep.c.orig 2006-04-16 01:34:26 +0200 +++ libguile/gc_os_dep.c 2006-10-08 10:51:50 +0200 d44 1 a44 1 @@@@ -1499,7 +1511,7 @@@@ d53 2 a54 3 Index: libguile/guile.c --- libguile/guile.c.orig 2006-02-18 07:08:45 +0100 +++ libguile/guile.c 2006-10-08 10:51:50 +0200 d64 22 @ 1.4 log @workaround array constraints under GCC 4.0 @ text @d2 4 a5 4 --- libguile/__scm.h.orig 2003-04-12 19:24:56 +0200 +++ libguile/__scm.h 2004-11-29 19:59:51 +0100 @@@@ -354,7 +354,8 @@@@ * that all the state of the process is contained in the stack. d14 3 a16 4 Index: libguile/gc_os_dep.c --- libguile/gc_os_dep.c.orig 2004-06-16 00:55:31 +0200 +++ libguile/gc_os_dep.c 2004-11-29 19:59:51 +0100 @@@@ -107,6 +107,14 @@@@ d31 1 a31 1 @@@@ -239,7 +247,11 @@@@ d44 1 a44 1 @@@@ -1489,7 +1501,7 @@@@ d53 3 a55 4 Index: libguile/guile.c --- libguile/guile.c.orig 2002-12-07 23:41:32 +0100 +++ libguile/guile.c 2005-10-14 15:49:54 +0200 @@@@ -88,7 +88,7 @@@@ d57 1 a57 1 #ifdef DYNAMIC_LINKING d59 3 a61 3 - extern const scm_lt_dlsymlist lt_preloaded_symbols[]; + extern const scm_lt_dlsymlist *lt_preloaded_symbols; scm_lt_dlpreload_default (lt_preloaded_symbols); d64 22 @ 1.3 log @upgrading package: guile 1.6.5 -> 1.6.6 @ text @d54 12 @ 1.3.6.1 log @MFC: workaround array constraints under GCC 4.0 @ text @a53 12 Index: libguile/guile.c --- libguile/guile.c.orig 2002-12-07 23:41:32 +0100 +++ libguile/guile.c 2005-10-14 15:49:54 +0200 @@@@ -88,7 +88,7 @@@@ { #ifdef DYNAMIC_LINKING /* libtool automagically inserts this variable into your executable... */ - extern const scm_lt_dlsymlist lt_preloaded_symbols[]; + extern const scm_lt_dlsymlist *lt_preloaded_symbols; scm_lt_dlpreload_default (lt_preloaded_symbols); #endif scm_boot_guile (argc, argv, inner_main, 0); @ 1.2 log @upgrading package: guile 1.6.4 -> 1.6.5 @ text @d3 1 a3 1 +++ libguile/__scm.h 2004-10-06 19:57:29 +0200 d16 1 a16 1 +++ libguile/gc_os_dep.c 2004-10-06 19:57:29 +0200 a53 13 Index: srfi/srfi-4.c --- srfi/srfi-4.c.orig 2004-09-20 07:48:00 +0200 +++ srfi/srfi-4.c 2004-10-06 20:03:20 +0200 @@@@ -337,6 +337,9 @@@@ inline static SCM make_uvec (const int pos, const char * func_name, int type, size_t len) { +#ifndef SIZE_MAX +#define SIZE_MAX ~((size_t)0) +#endif if (len > ((size_t) SIZE_MAX >> uvec_shifts[type])) { if(pos < 0) @ 1.1 log @add sparc/alpha patches from FreeBSD port @ text @d1 3 a3 2 --- libguile/__scm.h.orig Sat Apr 12 14:16:08 2003 +++ libguile/__scm.h Sun Jun 1 16:32:36 2003 d14 4 a17 3 --- libguile/gc_os_dep.c.orig Wed Apr 16 13:16:21 2003 +++ libguile/gc_os_dep.c Thu May 22 20:41:37 2003 @@@@ -93,6 +93,14 @@@@ d32 1 a32 1 @@@@ -225,7 +233,11 @@@@ d45 1 a45 1 @@@@ -1468,7 +1480,7 @@@@ d54 13 @