OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Oct-2006 08:02:08
Branch: HEAD Handle: 2006100907020600
Modified files:
openpkg-src/guile guile.patch guile.spec
Log:
upgrading package: guile 1.8.0 -> 1.8.1
Summary:
Revision Changes Path
1.6 +32 -29 openpkg-src/guile/guile.patch
1.51 +6 -2 openpkg-src/guile/guile.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/guile/guile.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 guile.patch
--- openpkg-src/guile/guile.patch 18 May 2006 07:19:31 -0000 1.5
+++ openpkg-src/guile/guile.patch 9 Oct 2006 06:02:06 -0000 1.6
@@ -1,6 +1,17 @@
+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 <netdb.h>
+ int
+ main ()
+ {
Index: libguile/__scm.h
---- libguile/__scm.h.orig 2006-02-12 14:29:11 +0100
-+++ libguile/__scm.h 2006-03-10 12:34:42 +0100
+--- libguile/__scm.h.orig 2006-02-18 07:08:44 +0100
++++ libguile/__scm.h 2006-10-08 10:51:50 +0200
@@ -421,7 +421,8 @@
* that all the state of the process is contained in the stack.
*/
@@ -11,8 +22,21 @@
# define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3")
#else
# define SCM_FLUSH_REGISTER_WINDOWS /* empty */
---- 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
+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
@@ -110,6 +110,14 @@
# define OPENBSD
# define mach_type_known
@@ -41,7 +65,7 @@
# define ALPHA
# if !defined(LINUX)
# define OSF1 /* a.k.a Digital Unix */
-@@ -1498,7 +1510,7 @@
+@@ -1499,7 +1511,7 @@
# include <setjmp.h>
#endif
@@ -50,8 +74,9 @@
# include <machine/trap.h>
#endif
---- libguile/guile.c.orig 2006-02-12 14:29:12 +0100
-+++ libguile/guile.c 2006-03-10 12:35:41 +0100
+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
@@ -68,7 +68,7 @@
{
#if !defined (__MINGW32__)
@@ -61,25 +86,3 @@
lt_dlpreload_default (lt_preloaded_symbols);
#endif
scm_boot_guile (argc, argv, inner_main, 0);
---- 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 <netdb.h>
- 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/guile/guile.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 guile.spec
--- openpkg-src/guile/guile.spec 15 Aug 2006 16:14:55 -0000 1.50
+++ openpkg-src/guile/guile.spec 9 Oct 2006 06:02:06 -0000 1.51
@@ -32,8 +32,8 @@
Class: PLUS
Group: Language
License: GPL
-Version: 1.8.0
-Release: 20060815
+Version: 1.8.1
+Release: 20061009
# list of sources
Source0: ftp://ftp.gnu.org/gnu/guile/guile-%{version}.tar.gz
@@ -65,12 +65,16 @@
%patch -p0
%build
+ ( echo "ac_cv_header_complex_h=no"
+ ) >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --infodir=%{l_prefix}/info \
--disable-error-on-warning \
--disable-shared \
--without-threads \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
