r21779 - gnucash/branches/2.4/packaging/win32 - Upgrade to GCC-4.6 and Guile 1.8.8

John Ralls jralls at code.gnucash.org
Wed Dec 28 00:48:23 EST 2011


Author: jralls
Date: 2011-12-28 00:48:23 -0500 (Wed, 28 Dec 2011)
New Revision: 21779
Trac: http://svn.gnucash.org/trac/changeset/21779

Added:
   gnucash/branches/2.4/packaging/win32/guile-1.8.8.patch
Modified:
   gnucash/branches/2.4/packaging/win32/defaults.sh
Log:
Upgrade to GCC-4.6 and Guile 1.8.8

The Guile 1.8.8 patch is mostly brought over from trunk, with the addition of fixing a bug which prevented loading slib. (This was dealt with on trunk by eliminating slib.)

Modified: gnucash/branches/2.4/packaging/win32/defaults.sh
===================================================================
--- gnucash/branches/2.4/packaging/win32/defaults.sh	2011-12-28 01:49:14 UTC (rev 21778)
+++ gnucash/branches/2.4/packaging/win32/defaults.sh	2011-12-28 05:48:23 UTC (rev 21779)
@@ -86,14 +86,14 @@
 
 # The URLs for precompiled gcc/mingw binaries
 set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.21-2-mingw32-bin.tar.lzma"
-set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.4.0-mingw32-bin.tar.gz"
-set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/gcc-core-4.4.0-mingw32-dll.tar.gz"
-set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.4.0-mingw32-bin.tar.gz"
-set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/gcc-c++-4.4.0-mingw32-dll.tar.gz"
+set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-4.5.2-1-mingw32-bin.tar.lzma"
+set_default GCC_CORE_DLL_URL "$SF_MIRROR/mingw/libgcc-4.5.2-1-mingw32-dll-1.tar.lzma"
+set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-c++-4.5.2-1-mingw32-bin.tar.lzma"
+set_default GCC_GPP_DLL_URL "$SF_MIRROR/mingw/libstdc++-4.5.2-1-mingw32-dll-6.tar.lzma"
 set_default GCC_GPP_PATCH "`pwd`/gcc-c++-4.4.0.patch"
-#set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
-set_default GCC_MPFR_URL "$SF_MIRROR/mingw/mpfr-2.4.1-mingw32-dll.tar.gz"
-set_default GCC_GMP_URL "$SF_MIRROR/mingw/gmp-4.2.4-mingw32-dll.tar.gz"
+set_default GCC_MPC_URL "$SF_MIRROR/mingw/libmpc-0.8.1-1-mingw32-dll-2.tar.lzma"
+set_default GCC_MPFR_URL "$SF_MIRROR/mingw/libmpfr-2.4.1-1-mingw32-dll-1.tar.lzma"
+set_default GCC_GMP_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
 set_default GCC_PTHREADS_URL "$SF_MIRROR/mingw/libpthread-2.8.0-3-mingw32-dll-2.tar.lzma"
 
 if [ "$CROSS_COMPILE" != yes ]; then
@@ -179,8 +179,10 @@
 set_default ACTIVE_PERL_URL "http://downloads.activestate.com/ActivePerl/releases/5.14.2.1402/ActivePerl-5.14.2.1402-MSWin32-x86-295342.zip"
 set_default ACTIVE_PERL_DIR $GLOBAL_DIR\\active-perl
 
+#set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
+#set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2"
 set_default AUTOCONF_URL "http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2"
-set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.10.2.tar.bz2"
+set_default AUTOMAKE_URL "http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2"
 set_default LIBTOOL_URL "http://ftp.gnu.org/gnu/libtool/libtool-2.2.6a.tar.gz"
 set_default AUTOTOOLS_DIR $GLOBAL_DIR\\autotools
 
@@ -190,9 +192,13 @@
 set_default GMP5_BIN_URL "$SF_MIRROR/mingw/libgmp-5.0.1-1-mingw32-dll-10.tar.lzma"
 set_default GMP5_DEV_URL "$SF_MIRROR/mingw/gmp-5.0.1-1-mingw32-dev.tar.lzma"
 
-set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
-set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
+GUILE_VERSION="1.8.8"
+set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-${GUILE_VERSION}.tar.gz"
 set_default GUILE_DIR $GLOBAL_DIR\\guile
+set_default GUILE_PATCH `pwd`/guile-1.8.8.patch
+#set_default GUILE_URL "http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
+set_default SLIB_URL "http://swiss.csail.mit.edu/ftpdir/scm/slib-3b3.zip"
+#set_default GUILE_DIR $GLOBAL_DIR\\guile
 
 set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
 set_default OPENSSL_DIR $GLOBAL_DIR\\openssl

Added: gnucash/branches/2.4/packaging/win32/guile-1.8.8.patch
===================================================================
--- gnucash/branches/2.4/packaging/win32/guile-1.8.8.patch	                        (rev 0)
+++ gnucash/branches/2.4/packaging/win32/guile-1.8.8.patch	2011-12-28 05:48:23 UTC (rev 21779)
@@ -0,0 +1,99 @@
+diff -urN old.guile-1.8.7/configure.in new/guile-1.8.7/configure.in
+--- old.guile-1.8.7/configure.in  2009-07-05 14:40:06.000000000 -0400
++++ new.guile-1.8.7/configure.in  2009-08-26 15:33:43.996500000 -0400
+@@ -25,7 +25,7 @@
+ 
+ ]])
+ 
+-AC_PREREQ(2.61)
++AC_PREREQ(2.63)
+ 
+ dnl  `patsubst' here deletes the newline which "echo" prints.  We can't use
+ dnl  "echo -n" since -n is not portable (see autoconf manual "Limitations of
+@@ -41,7 +41,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(GUILE-VERSION)
+ 
+-AM_INIT_AUTOMAKE([gnu no-define check-news -Wall -Wno-override])
++AM_INIT_AUTOMAKE([1.11 silent-rules gnu no-define check-news -Wall -Wno-override])
+ 
+ AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
+ AC_CONFIG_SRCDIR([GUILE-VERSION])
+@@ -68,8 +68,6 @@
+ 
+ AB_INIT
+ 
+-AC_LIBTOOL_WIN32_DLL
+-
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -82,8 +80,7 @@
+ # for per-target cflags in the libguile subdir
+ AM_PROG_CC_C_O
+ 
+-AC_LIBTOOL_DLOPEN
+-AC_PROG_LIBTOOL
++LT_INIT([win32-dll dlopen])
+ AC_CHECK_LIB([ltdl], [lt_dlinit], ,
+   [AC_MSG_ERROR([libltdl not found.  See README.])])
+ AC_CHECK_HEADER([ltdl.h], [],
+diff -urN old.guile-1.8.7/guile-readline/configure.in new/guile-1.8.7/guile-readline/configure.in
+--- old.guile-1.8.7/guile-readline/configure.in 2009-07-03 18:19:22.000000000 -0400
++++ new.guile-1.8.7/guile-readline/configure.in 2009-08-26 15:35:08.398500000 -0400
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.50)
++AC_PREREQ(2.63)
+ 
+ dnl Don't use "echo -n", which is not portable (e.g., not available on
+ dnl MacOS X).  Instead, use `patsubst' to remove the newline.
+@@ -10,15 +10,14 @@
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_SRCDIR(readline.c)
+ AM_CONFIG_HEADER([guile-readline-config.h])
+-AM_INIT_AUTOMAKE([foreign no-define])
++AM_INIT_AUTOMAKE([1.11 silent-rules foreign no-define])
+ 
+ . $srcdir/../GUILE-VERSION
+ 
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+-AC_LIBTOOL_WIN32_DLL
+-AC_PROG_LIBTOOL
++LT_INIT([win32-dll])
+ 
+ dnl
+ dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
+--- old.guile-1.8.7/pre-inst-guile.in	2010-05-30 09:38:50 +0000
++++ new.guile-1.8.7/pre-inst-guile.in	2010-05-30 09:39:30 +0000
+@@ -87,7 +87,7 @@
+ export DYLD_LIBRARY_PATH
+ 
+ # set GUILE (clobber)
+-GUILE=${top_builddir}/libguile/guile
++GUILE=${top_builddir}/libguile/.libs/guile
+ export GUILE
+ 
+ # do it
+===================================================================
+--- sid.orig/libguile/threads.h
++++ sid/libguile/threads.h
+@@ -26,7 +26,6 @@
+ #include "libguile/procs.h"
+ #include "libguile/throw.h"
+ #include "libguile/root.h"
+-#include "libguile/iselect.h"
+ #include "libguile/dynwind.h"
+ #include "libguile/continuations.h"
+ 
+--- a/ice-9/boot-9.scm~	2010-12-13 09:24:39 -0800
++++ b/ice-9/boot-9.scm	2011-12-27 16:12:32 -0800
+@@ -1626,6 +1626,7 @@
+ 	      (if (and oldname
+ 		       (> (string-length filename) 0)
+ 		       (not (char=? (string-ref filename 0) #\/))
++		       (not (char=? (string-ref filename 1) #\:))
+ 		       (not (string=? (dirname oldname) ".")))
+ 		  (string-append (dirname oldname) "/" filename)
+ 		  filename)



More information about the gnucash-changes mailing list