gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-25 08:58:27 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/commoncpp2: fix building with libgcrypt 1.6 and higher

Browse Source 
Reported-by: 3PO <r2d2@freakmail.de>
Gentoo-Bug: 512670

Package-Manager: portage-2.2.23
This commit is contained in:
Sergey Popov
2015-11-25 15:50:29 +03:00
parent f28f2e793b
commit b440a90eee
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-cpp/commoncpp2/commoncpp2-1.8.1-r1.ebuild
View File

@@ -28,7 +28,9 @@ src_prepare() {
"${FILESDIR}/1.8.0-glibc212.patch" \
"${FILESDIR}/1.8.1-autoconf-update.patch" \
"${FILESDIR}/1.8.1-fix-buffer-overflow.patch" \
"${FILESDIR}/1.8.1-parallel-build.patch"
"${FILESDIR}/1.8.1-parallel-build.patch" \
"${FILESDIR}/1.8.1-libgcrypt.patch"
epatch_user
eautoreconf
}

48
dev-cpp/commoncpp2/files/1.8.1-libgcrypt.patch Normal file
View File

@@ -0,0 +1,48 @@
--- src/ssl.cpp.orig 2010-11-01 03:42:51.000000000 +0300
+++ src/ssl.cpp 2015-11-25 15:32:23.923057317 +0300
@@ -99,35 +99,7 @@
return 0;
}
-extern "C" {
- static int _wrap_mutex_init(void **priv)
- {
- return _gcry_mutex_init((Mutex **)(priv));
- }
-
- static int _wrap_mutex_destroy(void **priv)
- {
- return _gcry_mutex_destroy((Mutex **)(priv));
- }
-
- static int _wrap_mutex_lock(void **priv)
- {
- return _gcry_mutex_lock((Mutex **)(priv));
- }
-
- static int _wrap_mutex_unlock(void **priv)
- {
- return _gcry_mutex_unlock((Mutex **)(priv));
- }
-
- static struct gcry_thread_cbs _gcry_threads =
- {
- GCRY_THREAD_OPTION_PTHREAD, NULL,
- _wrap_mutex_init, _wrap_mutex_destroy,
- _wrap_mutex_lock, _wrap_mutex_unlock
- };
-
-};
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
@@ -135,7 +107,7 @@
public:
_ssl_global() {
#ifndef WIN32
- gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
+ gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
#endif
gnutls_global_init();
}