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: 18-May-2006 09:19:31
Branch: HEAD Handle: 2006051808193100
Modified files:
openpkg-src/guile guile.patch guile.spec
Log:
upgrading package: guile 1.6.7 -> 1.8.0
Summary:
Revision Changes Path
1.5 +38 -18 openpkg-src/guile/guile.patch
1.48 +8 -9 openpkg-src/guile/guile.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/guile/guile.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 guile.patch
--- openpkg-src/guile/guile.patch 14 Oct 2005 13:54:21 -0000 1.4
+++ openpkg-src/guile/guile.patch 18 May 2006 07:19:31 -0000 1.5
@@ -1,8 +1,8 @@
Index: libguile/__scm.h
---- 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.
+--- libguile/__scm.h.orig 2006-02-12 14:29:11 +0100
++++ libguile/__scm.h 2006-03-10 12:34:42 +0100
+@@ -421,7 +421,8 @@
+ * that all the state of the process is contained in the stack.
*/
-#if defined (sparc) || defined (__sparc__) || defined (__sparc)
@@ -11,10 +11,9 @@
# define SCM_FLUSH_REGISTER_WINDOWS asm("ta 3")
#else
# define SCM_FLUSH_REGISTER_WINDOWS /* empty */
-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 @@
+--- 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
+@@ -110,6 +110,14 @@
# define OPENBSD
# define mach_type_known
# endif
@@ -29,7 +28,7 @@
# if defined(__NetBSD__) && defined(__powerpc__)
# define POWERPC
# define NETBSD
-@@ -239,7 +247,11 @@
+@@ -244,7 +252,11 @@
# define ARM32
# define mach_type_known
# endif
@@ -42,7 +41,7 @@
# define ALPHA
# if !defined(LINUX)
# define OSF1 /* a.k.a Digital Unix */
-@@ -1489,7 +1501,7 @@
+@@ -1498,7 +1510,7 @@
# include <setjmp.h>
#endif
@@ -51,15 +50,36 @@
# include <machine/trap.h>
#endif
-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 @@
+--- libguile/guile.c.orig 2006-02-12 14:29:12 +0100
++++ libguile/guile.c 2006-03-10 12:35:41 +0100
+@@ -68,7 +68,7 @@
{
- #ifdef DYNAMIC_LINKING
+ #if !defined (__MINGW32__)
/* 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);
+- 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);
+--- 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.47 -r1.48 guile.spec
--- openpkg-src/guile/guile.spec 1 Jan 2006 13:14:21 -0000 1.47
+++ openpkg-src/guile/guile.spec 18 May 2006 07:19:31 -0000 1.48
@@ -32,8 +32,8 @@
Class: PLUS
Group: Language
License: GPL
-Version: 1.6.7
-Release: 20051014
+Version: 1.8.0
+Release: 20060518
# list of sources
Source0: ftp://ftp.gnu.org/gnu/guile/guile-%{version}.tar.gz
@@ -44,6 +44,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make, texinfo, gcc
PreReq: OpenPKG, openpkg >= 20040130, libtool
+BuildPreReq: gmp
+PreReq: gmp
AutoReq: no
AutoReqProv: no
@@ -63,18 +65,15 @@
%patch -p0
%build
- opt="%{l_cflags -O}"
- case "%{l_platform -t}" in
- *-sunos* ) opt="%{l_cflags}" ;;
- esac
CC="%{l_cc}" \
- LD="%{l_prefix}/bin/ld" \
- CFLAGS="$opt" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --disable-error-on-warning \
--disable-shared \
--without-threads
-
%{l_make} %{l_mflags}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
