summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-06-24 08:38:34 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-06-24 08:38:34 +0000
commit49e6cbefc1c97a7b31e19a1f8df0ce5b7ce1c985 (patch)
tree500e3b92849b540da8f6407c6015fa3ab64c187b /app-crypt
parentsci-libs/superlu: Unset VERBOSE, because it is used internally, #423259 (diff)
downloadgentoo-2-49e6cbefc1c97a7b31e19a1f8df0ce5b7ce1c985.tar.gz
gentoo-2-49e6cbefc1c97a7b31e19a1f8df0ce5b7ce1c985.tar.bz2
gentoo-2-49e6cbefc1c97a7b31e19a1f8df0ce5b7ce1c985.zip
Add patch to build with GCC 4.7 (fixes bug #422873).
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/eid-mw/ChangeLog6
-rw-r--r--app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild6
-rw-r--r--app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch42
3 files changed, 52 insertions, 2 deletions
diff --git a/app-crypt/eid-mw/ChangeLog b/app-crypt/eid-mw/ChangeLog
index 7e3c9dbfdb48..a750097d5e9d 100644
--- a/app-crypt/eid-mw/ChangeLog
+++ b/app-crypt/eid-mw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/eid-mw
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/ChangeLog,v 1.4 2012/06/24 08:38:34 flameeyes Exp $
+
+ 24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+ +files/eid-mw-4.0.2_p1188+gcc-4.7.patch, eid-mw-4.0.2_p1188.ebuild:
+ Add patch to build with GCC 4.7 (fixes bug #422873).
31 May 2012; Zac Medico <zmedico@gentoo.org> eid-mw-4.0.2_p1188.ebuild:
inherit multilib for get_libdir
diff --git a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
index 295455e39a7e..3405b91d1262 100644
--- a/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.3 2012/05/31 03:10:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/eid-mw-4.0.2_p1188.ebuild,v 1.4 2012/06/24 08:38:34 flameeyes Exp $
EAPI=4
@@ -39,6 +39,10 @@ if [[ ${PV} == "9999" ]]; then
src_prepare() {
eautoreconf
}
+else
+ src_prepare() {
+ epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+ }
fi
src_configure() {
diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
new file mode 100644
index 000000000000..67a8d1426d76
--- /dev/null
+++ b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
@@ -0,0 +1,42 @@
+Index: eid-mw-4.0.2/common/src/socket/socket.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
++++ eid-mw-4.0.2/common/src/socket/socket.cpp
+@@ -21,6 +21,10 @@
+ #include "../eiderrors.h"
+ #include <iostream>
+
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ namespace eIDMW
+ {
+
+Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
++++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
+@@ -26,6 +26,7 @@
+ #include <netinet/in.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
++#include <unistd.h>
+ #ifndef SOCKET_ERROR
+ #define SOCKET_ERROR -1
+ #endif
+Index: eid-mw-4.0.2/common/src/util.cpp
+===================================================================
+--- eid-mw-4.0.2.orig/common/src/util.cpp
++++ eid-mw-4.0.2/common/src/util.cpp
+@@ -27,6 +27,10 @@
+
+ #include <stdlib.h>
+
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #ifdef WIN32
+ #include <windows.h>
+ #endif