Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3b33ccd0e41e59cc92c0c516272e8ac26d3be9a0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3b33ccd0e41e59cc92c0c516272e8ac26d3be9a0)
  • Date: Fri, 23 Apr 2010 14:19:14 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/asio/DEPENDS | 3 +-
libs/asio/HISTORY | 3 ++
libs/asio/PRE_BUILD | 3 ++
libs/asio/gcc-4.4.patch | 55
++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 95828fcd5340b682ed63134a50b382263e05a2a1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/asio: fixed build with gcc 4.4

diff --git a/libs/asio/DEPENDS b/libs/asio/DEPENDS
index fd0b0eb..08da63e 100755
--- a/libs/asio/DEPENDS
+++ b/libs/asio/DEPENDS
@@ -1 +1,2 @@
-depends g++
+depends g++ &&
+depends openssl
diff --git a/libs/asio/HISTORY b/libs/asio/HISTORY
index d60f4c3..1dce1fa 100644
--- a/libs/asio/HISTORY
+++ b/libs/asio/HISTORY
@@ -1,3 +1,6 @@
+2010-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gcc-4.4.patch: fixed build with gcc 4.4
+
2009-11-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.4.1

diff --git a/libs/asio/PRE_BUILD b/libs/asio/PRE_BUILD
new file mode 100755
index 0000000..1b8fb01
--- /dev/null
+++ b/libs/asio/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.4.patch
diff --git a/libs/asio/gcc-4.4.patch b/libs/asio/gcc-4.4.patch
new file mode 100644
index 0000000..93f7f3e
--- /dev/null
+++ b/libs/asio/gcc-4.4.patch
@@ -0,0 +1,55 @@
+--- asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp.orig
2010-04-23 20:57:39.935389413 +0200
++++ asio-1.4.1/include/asio/ssl/detail/openssl_context_service.hpp
2010-04-23 21:00:04.978889835 +0200
+@@ -70,40 +70,40 @@
+ switch (m)
+ {
+ case context_base::sslv2:
+- ssl_method = ::SSLv2_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv2_method());
+ break;
+ case context_base::sslv2_client:
+- ssl_method = ::SSLv2_client_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv2_client_method());
+ break;
+ case context_base::sslv2_server:
+- ssl_method = ::SSLv2_server_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv2_server_method());
+ break;
+ case context_base::sslv3:
+- ssl_method = ::SSLv3_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv3_method());
+ break;
+ case context_base::sslv3_client:
+- ssl_method = ::SSLv3_client_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv3_client_method());
+ break;
+ case context_base::sslv3_server:
+- ssl_method = ::SSLv3_server_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv3_server_method());
+ break;
+ case context_base::tlsv1:
+- ssl_method = ::TLSv1_method();
++ ssl_method = const_cast<SSL_METHOD *>(::TLSv1_method());
+ break;
+ case context_base::tlsv1_client:
+- ssl_method = ::TLSv1_client_method();
++ ssl_method = const_cast<SSL_METHOD *>(::TLSv1_client_method());
+ break;
+ case context_base::tlsv1_server:
+- ssl_method = ::TLSv1_server_method();
++ ssl_method = const_cast<SSL_METHOD *>(::TLSv1_server_method());
+ break;
+ case context_base::sslv23:
+- ssl_method = ::SSLv23_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv23_method());
+ break;
+ case context_base::sslv23_client:
+- ssl_method = ::SSLv23_client_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv23_client_method());
+ break;
+ case context_base::sslv23_server:
+- ssl_method = ::SSLv23_server_method();
++ ssl_method = const_cast<SSL_METHOD *>(::SSLv23_server_method());
+ break;
+ default:
+ break;



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3b33ccd0e41e59cc92c0c516272e8ac26d3be9a0), Florian Franzmann, 04/23/2010

Archive powered by MHonArc 2.6.24.

Top of Page