Menu
▾
▴
[openMSX-commits] [SCM] openMSX (main) branch master updated. RELEASE_0_9_1-403-g0b4be1b
|
From: Manuel B. <man...@us...> - 2013-05-18 12:44:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "openMSX (main)".
The branch, master has been updated
via 0b4be1b36c792a4e477167fc1faa1e222773eccf (commit)
via 297bb78f64fcf892390ae5a8ad4f2a4b650c335d (commit)
from 8457a1af7b4c4d50c505f57ae7e49f99f0e47398 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b4be1b36c792a4e477167fc1faa1e222773eccf
Author: Manuel Bilderbeek <Man...@gm...>
Date: Sat May 18 14:43:54 2013 +0200
Upgrade Tcl to 8.5.14.
commit 297bb78f64fcf892390ae5a8ad4f2a4b650c335d
Author: Manuel Bilderbeek <Man...@gm...>
Date: Sat May 18 14:42:35 2013 +0200
Document that libxml2 2.9.0/1 do not compile.
-----------------------------------------------------------------------
Summary of changes:
build/3rdparty/tcl8.5.11.diff | 87 -----------------------------------------
build/3rdparty/tcl8.5.14.diff | 24 +++++++++++
build/packages.py | 8 ++--
3 files changed, 28 insertions(+), 91 deletions(-)
delete mode 100644 build/3rdparty/tcl8.5.11.diff
create mode 100644 build/3rdparty/tcl8.5.14.diff
diff --git a/build/3rdparty/tcl8.5.11.diff b/build/3rdparty/tcl8.5.11.diff
deleted file mode 100644
index ee5f6d3..0000000
--- a/build/3rdparty/tcl8.5.11.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ru tcl8.5.11.org/generic/tcl.h tcl8.5.11/generic/tcl.h
---- tcl8.5.11.org/generic/tcl.h 2011-11-01 15:04:51.000000000 +0100
-+++ tcl8.5.11/generic/tcl.h 2012-01-29 16:31:41.000000000 +0100
-@@ -168,7 +168,7 @@
- * MSVCRT.
- */
-
--#if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
-+#if (defined(__WIN32__) && (defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0550)) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
- # define HAVE_DECLSPEC 1
- # ifdef STATIC_BUILD
- # define DLLIMPORT
-diff -ru tcl8.5.11.org/generic/tclPosixStr.c tcl8.5.11/generic/tclPosixStr.c
---- tcl8.5.11.org/generic/tclPosixStr.c 2011-11-01 15:04:51.000000000 +0100
-+++ tcl8.5.11/generic/tclPosixStr.c 2012-01-29 16:34:52.000000000 +0100
-@@ -341,7 +341,7 @@
- #ifdef EPERM
- case EPERM: return "EPERM";
- #endif
--#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-+#if !defined(_MSC_VER) && defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
- case EPFNOSUPPORT: return "EPFNOSUPPORT";
- #endif
- #ifdef EPIPE
-@@ -401,7 +401,7 @@
- #ifdef ESHUTDOWN
- case ESHUTDOWN: return "ESHUTDOWN";
- #endif
--#ifdef ESOCKTNOSUPPORT
-+#if !defined(_MSC_VER) && defined ESOCKTNOSUPPORT
- case ESOCKTNOSUPPORT: return "ESOCKTNOSUPPORT";
- #endif
- #ifdef ESPIPE
-@@ -789,7 +789,7 @@
- #ifdef EPERM
- case EPERM: return "not owner";
- #endif
--#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
-+#if !defined(_MSC_VER) && defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
- case EPFNOSUPPORT: return "protocol family not supported";
- #endif
- #ifdef EPIPE
-@@ -849,7 +849,7 @@
- #ifdef ESHUTDOWN
- case ESHUTDOWN: return "can't send after socket shutdown";
- #endif
--#ifdef ESOCKTNOSUPPORT
-+#if !defined(_MSC_VER) && defined ESOCKTNOSUPPORT
- case ESOCKTNOSUPPORT: return "socket type not supported";
- #endif
- #ifdef ESPIPE
-diff -ru tcl8.5.11.org/unix/configure tcl8.5.11/unix/configure
---- tcl8.5.11.org/unix/configure 2011-11-04 13:47:57.000000000 +0100
-+++ tcl8.5.11/unix/configure 2012-01-29 16:35:53.000000000 +0100
-@@ -14925,7 +14925,7 @@
- else
-
- if test "$cross_compiling" = yes; then
-- tcl_cv_strtod_buggy=buggy
-+ tcl_cv_strtod_buggy=ok
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-diff -ru tcl8.5.11.org/unix/Makefile.in tcl8.5.11/unix/Makefile.in
---- tcl8.5.11.org/unix/Makefile.in 2011-11-04 13:47:57.000000000 +0100
-+++ tcl8.5.11/unix/Makefile.in 2012-01-29 16:36:18.000000000 +0100
-@@ -732,7 +732,7 @@
- fi
- @EXTRA_INSTALL_BINARIES@
-
--install-libraries: libraries $(INSTALL_TZDATA) install-msgs
-+install-libraries: libraries $(INSTALL_TZDATA)
- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \
- do \
- if [ ! -d "$$i" ] ; then \
-diff -ru tcl8.5.11.org/win/Makefile.in tcl8.5.11/win/Makefile.in
---- tcl8.5.11.org/win/Makefile.in 2011-11-04 13:47:58.000000000 +0100
-+++ tcl8.5.11/win/Makefile.in 2012-01-29 16:36:39.000000000 +0100
-@@ -601,7 +601,7 @@
- $(COPY) $(REG_LIB_FILE) $(LIB_INSTALL_DIR)/reg1.2; \
- fi
-
--install-libraries: libraries install-tzdata install-msgs
-+install-libraries: libraries
- @for i in $(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR); \
- do \
diff --git a/build/3rdparty/tcl8.5.14.diff b/build/3rdparty/tcl8.5.14.diff
new file mode 100644
index 0000000..604336c
--- /dev/null
+++ b/build/3rdparty/tcl8.5.14.diff
@@ -0,0 +1,24 @@
+diff -ru tcl8.5.14.orig/generic/tcl.h tcl8.5.14/generic/tcl.h
+--- tcl8.5.14.orig/generic/tcl.h 2013-03-22 12:39:05.000000000 +0100
++++ tcl8.5.14/generic/tcl.h 2013-05-18 14:27:30.000000000 +0200
+@@ -168,7 +168,7 @@
+ * MSVCRT.
+ */
+
+-#if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
++#if (defined(__WIN32__) && (defined(_MSC_VER) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0550)) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec))))
+ # define HAVE_DECLSPEC 1
+ # ifdef STATIC_BUILD
+ # define DLLIMPORT
+diff -ru tcl8.5.14.orig/unix/configure tcl8.5.14/unix/configure
+--- tcl8.5.14.orig/unix/configure 2013-04-01 20:36:35.000000000 +0200
++++ tcl8.5.14/unix/configure 2013-05-18 14:15:24.000000000 +0200
+@@ -15068,7 +15068,7 @@
+ else
+
+ if test "$cross_compiling" = yes; then
+- tcl_cv_strtod_buggy=buggy
++ tcl_cv_strtod_buggy=ok
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
diff --git a/build/packages.py b/build/packages.py
index 7de56b7..ae003dd 100644
--- a/build/packages.py
+++ b/build/packages.py
@@ -131,7 +131,7 @@ class LibXML2(DownloadablePackage):
downloadURL = 'http://xmlsoft.org/sources'
niceName = 'libxml2'
sourceName = 'libxml2'
- version = '2.8.0'
+ version = '2.8.0' # 2.9.0 and 2.9.1 do not seem to compile...
fileLength = 4915203
checksums = {
'sha256':
@@ -202,11 +202,11 @@ class TCL(DownloadablePackage):
downloadURL = 'http://downloads.sourceforge.net/tcl'
niceName = 'Tcl'
sourceName = 'tcl'
- version = '8.5.11'
- fileLength = 4484001
+ version = '8.5.14'
+ fileLength = 4528533
checksums = {
'sha256':
- '8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a',
+ '7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d',
}
@classmethod
hooks/post-receive
--
openMSX (main)
|