diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-06-17 11:42:41 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-06-17 11:42:41 +0000 |
commit | 58e60f6909d832bb6100e9a168f002a14d4214ef (patch) | |
tree | 3676c05fa6760a824faa9ecb99d28794fb4563c8 /devel/ice/files/patch-cpp-src-IceUtil-CtrlCHandler.cpp | |
parent | Update dialog4ports to 0.1.5 (diff) |
- update to 3.5.0
- add license (GPLv2)
- switch to bdb 5
- mark broken on 10.x for the time being (as it was discussed on ports@ ML)
- remove patches, applied upstream
This version of Ice brings many new features, e.g.
- New encoding version
- Metrics facility
- Optional data members and parameters
- Compact encoding for classes and exceptions
- Compact type IDs
- Preserved slices
- Custom enumerator values
- C++11 lambda functions
- Remote Update of Server Properties
- IPv6 now enabled by default
- Python 3 support
- Use Berkley DB 5
See http://doc.zeroc.com/display/Ice/Release+Notes for details.
PR: 179233
Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer)
Tested by: Jaret Bartsch <jaretbartsch@yahoo.ca>
Notes
Notes:
svn path=/head/; revision=321096
Diffstat (limited to '')
-rw-r--r-- | devel/ice/files/patch-cpp-src-IceUtil-CtrlCHandler.cpp | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/devel/ice/files/patch-cpp-src-IceUtil-CtrlCHandler.cpp b/devel/ice/files/patch-cpp-src-IceUtil-CtrlCHandler.cpp deleted file mode 100644 index 8f86801f6b33..000000000000 --- a/devel/ice/files/patch-cpp-src-IceUtil-CtrlCHandler.cpp +++ /dev/null @@ -1,49 +0,0 @@ ---- cpp.orig/src/IceUtil/CtrlCHandler.cpp 2011-06-15 21:43:59.000000000 +0200 -+++ cpp/src/IceUtil/CtrlCHandler.cpp 2012-03-04 20:14:53.000000000 +0100 -@@ -219,29 +219,41 @@ - sigaddset(&ctrlCLikeSignals, SIGHUP); - sigaddset(&ctrlCLikeSignals, SIGINT); - sigaddset(&ctrlCLikeSignals, SIGTERM); -- int rc = pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0); -+#ifndef NDEBUG -+ int rc = -+#endif -+ pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0); - assert(rc == 0); - - // Joinable thread -- rc = pthread_create(&_tid, 0, sigwaitThread, 0); -+#ifndef NDEBUG -+ rc = -+#endif -+ pthread_create(&_tid, 0, sigwaitThread, 0); - assert(rc == 0); - } - } - - CtrlCHandler::~CtrlCHandler() - { -- int rc = pthread_cancel(_tid); -+#ifndef NDEBUG -+ int rc = -+#endif -+ pthread_cancel(_tid); - assert(rc == 0); - #if defined(__APPLE__) - // - // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see - // comment in sigwaitThread - // -- rc = pthread_kill(_tid, SIGTERM); -+ pthread_kill(_tid, SIGTERM); - //assert(rc == 0); For some reaosns, this assert is sometime triggered - #endif - void* status = 0; -- rc = pthread_join(_tid, &status); -+#ifndef NDEBUG -+ rc = -+#endif -+ pthread_join(_tid, &status); - assert(rc == 0); - #if !defined(__APPLE__) - assert(status == PTHREAD_CANCELED); |