diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2006-10-23 09:48:40 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2006-10-23 09:48:40 +0000 |
| commit | 1a9525cd5a63d84a883ccacfd66167ac770c1466 (patch) | |
| tree | c853b1dccd6fec3a417795066795ff38cbffd0f3 /dev-libs/beecrypt/files | |
| parent | Parallelize mmake depend and mmake install targets. (diff) | |
| download | historical-1a9525cd5a63d84a883ccacfd66167ac770c1466.tar.gz historical-1a9525cd5a63d84a883ccacfd66167ac770c1466.tar.bz2 historical-1a9525cd5a63d84a883ccacfd66167ac770c1466.zip | |
Fixed assembly and threading issues
Package-Manager: portage-2.1.1
Diffstat (limited to 'dev-libs/beecrypt/files')
| -rw-r--r-- | dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch | 13 | ||||
| -rw-r--r-- | dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch | 78 |
2 files changed, 91 insertions, 0 deletions
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch new file mode 100644 index 000000000000..c2349eb3ffc4 --- /dev/null +++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-asm.patch @@ -0,0 +1,13 @@ +--- ./gas/x86.m4.org 2006-10-23 10:31:02.000000000 +0200 ++++ ./gas/x86.m4 2006-10-23 10:31:13.000000000 +0200 +@@ -48,3 +48,10 @@ define(USE_MMX) + define(USE_SSE) + define(USE_SSE2) + ') ++ifelse(ASM_ARCH,pentium-m,` ++undefine(`ALIGN') ++define(ALIGN,`.p2align 4') ++define(USE_MMX) ++define(USE_SSE) ++define(USE_SSE2) ++') diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch new file mode 100644 index 000000000000..d47cac4ca3a0 --- /dev/null +++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-threads.patch @@ -0,0 +1,78 @@ +diff -urNp beecrypt-4.1.2.org/c++/mutex.h beecrypt-4.1.2/c++/mutex.h +--- beecrypt-4.1.2.org/c++/mutex.h 2004-09-07 13:47:51.000000000 +0300 ++++ beecrypt-4.1.2/c++/mutex.h 2006-10-23 11:19:04.000000000 +0200 +@@ -37,7 +37,9 @@ namespace beecrypt { + class BEECRYPTCXXAPI mutex + { + private: ++#ifdef ENABLE_THREADS + bc_mutex_t _lock; ++#endif + + public: + inline void init() throw (char*) +@@ -55,7 +57,9 @@ namespace beecrypt { + if ((rc = pthread_mutex_init(&_lock, 0))) + throw strerror(rc); + # else ++ # ifdef ENABLE_THREADS + # error ++ # endif + # endif + #endif + } +@@ -75,7 +79,9 @@ namespace beecrypt { + if ((rc = pthread_mutex_lock(&_lock))) + throw strerror(rc); + # else ++ # ifdef ENABLE_THREADS + # error ++ # endif + # endif + #endif + } +@@ -107,7 +113,9 @@ namespace beecrypt { + return false; + throw strerror(rc); + # else ++ # ifdef ENABLE_THREADS + # error ++ # endif + # endif + #endif + } +@@ -126,7 +134,9 @@ namespace beecrypt { + if ((rc = pthread_mutex_unlock(&_lock))) + throw strerror(rc); + # else ++ # ifdef ENABLE_THREADS + # error ++ # endif + # endif + #endif + } +@@ -145,7 +155,9 @@ namespace beecrypt { + if ((rc = pthread_mutex_destroy(&_lock))) + throw strerror(rc); + # else ++ # ifdef ENABLE_THREADS + # error ++ # endif + # endif + #endif + } +diff -urNp beecrypt-4.1.2.org/c++/security/Security.cxx beecrypt-4.1.2/c++/security/Security.cxx +--- beecrypt-4.1.2.org/c++/security/Security.cxx 2004-11-02 09:06:58.000000000 +0200 ++++ beecrypt-4.1.2/c++/security/Security.cxx 2006-10-23 11:19:23.000000000 +0200 +@@ -115,10 +115,8 @@ void Security::initialize() + { + #if WIN32 + const Provider& (*inst)(void*) = (const Provider& (*)(void*)) GetProcAddress((HMODULE) handle, "provider_const_ref"); +- #elif HAVE_PTHREAD_H +- const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref"); + #else +- # error ++ const Provider& (*inst)(void*) = (const Provider& (*)(void*)) dlsym(handle, "provider_const_ref"); + #endif + + if (inst) |