diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-13 09:07:38 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-13 09:07:38 +0100 |
| commit | 004922d40fbe93c4239bd481e0520e168c848698 (patch) | |
| tree | ddd86c3eee6c7041150addc7548e65b7b3b5c881 /dev-libs/Ice/files | |
| parent | Bump PostgreSQL version (diff) | |
| download | portage-004922d40fbe93c4239bd481e0520e168c848698.tar.bz2 portage-004922d40fbe93c4239bd481e0520e168c848698.tar.xz portage-004922d40fbe93c4239bd481e0520e168c848698.zip | |
Bump Ice to 3.6.3
Diffstat (limited to 'dev-libs/Ice/files')
| -rw-r--r-- | dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch | 12 | ||||
| -rw-r--r-- | dev-libs/Ice/files/dont-append-c++11-to-libs.patch | 4 | ||||
| -rw-r--r-- | dev-libs/Ice/files/dont-separate-c++11-libs.patch | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch b/dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch new file mode 100644 index 0000000..6a469a4 --- /dev/null +++ b/dev-libs/Ice/files/dont-append-c++11-to-libs-3.6.3.patch @@ -0,0 +1,12 @@ +diff --git cpp/src/Ice/DynamicLibrary.cpp cpp/src/Ice/DynamicLibrary.cpp +index d70e14b..721832b 100644 +--- cpp/src/Ice/DynamicLibrary.cpp ++++ cpp/src/Ice/DynamicLibrary.cpp +@@ -16,7 +16,6 @@ + #endif + + #if defined(ICE_CPP11) && defined(__GNUC__) && (__GNUC__ < 6) && defined(__GLIBCXX__) +-# define ICE_LIBSUFFIX "++11" + #endif + + using namespace Ice; diff --git a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch b/dev-libs/Ice/files/dont-append-c++11-to-libs.patch index 4d9f748..41b3a01 100644 --- a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch +++ b/dev-libs/Ice/files/dont-append-c++11-to-libs.patch @@ -1,5 +1,5 @@ ---- ice-3.6.2/cpp/src/Ice/DynamicLibrary.cpp -+++ ice-3.6.2/cpp/src/Ice/DynamicLibrary.cpp +--- cpp/src/Ice/DynamicLibrary.cpp ++++ cpp/src/Ice/DynamicLibrary.cpp @@ -89,9 +89,6 @@ if(comma == string::npos) { diff --git a/dev-libs/Ice/files/dont-separate-c++11-libs.patch b/dev-libs/Ice/files/dont-separate-c++11-libs.patch index 2283c0e..4c02df0 100644 --- a/dev-libs/Ice/files/dont-separate-c++11-libs.patch +++ b/dev-libs/Ice/files/dont-separate-c++11-libs.patch @@ -1,5 +1,5 @@ ---- ice-3.6.2/config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100 -+++ ice-3.6.2/config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100 +--- config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100 ++++ config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100 @@ -115,15 +115,6 @@ lp32suffix = /i386-linux-gnu endif |