diff options
author | Eric Sandall | 2011-05-12 16:19:48 -0700 |
---|---|---|
committer | Eric Sandall | 2011-05-12 16:32:40 -0700 |
commit | 6d089828581f856c9c46b63ffc00cc1dea39593d (patch) | |
tree | e1a225451161a4c99b3eedf63e99f2fcd5ccf65f /chat-libs | |
parent | 0d82d958d1550464a7bf42a402fb458f88b3d6fb (diff) |
libmsn: Only apply openssl-1.0.0.patch when using OpenSSL 1.0.0+
with openssl 0.9.8r:
Scanning dependencies of target msntest
[100%] Building CXX object msntest/CMakeFiles/msntest.dir/msntest.cpp.o
/usr/src/libmsn-4.1/msntest/msntest.cpp: In function 'int main()':
/usr/src/libmsn-4.1/msntest/msntest.cpp:265: error: invalid conversion
from 'const SSL_METHOD*' to 'SSL_METHOD*'
/usr/src/libmsn-4.1/msntest/msntest.cpp:265: error: initializing
argument 1 of 'SSL_CTX* SSL_CTX_new(SSL_METHOD*)'
make[2]: *** [msntest/CMakeFiles/msntest.dir/msntest.cpp.o] Error 1
make[1]: *** [msntest/CMakeFiles/msntest.dir/all] Error 2
Diffstat (limited to 'chat-libs')
-rw-r--r-- | chat-libs/libmsn/HISTORY | 3 | ||||
-rwxr-xr-x | chat-libs/libmsn/PRE_BUILD | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY index e455d2db88..039731f351 100644 --- a/chat-libs/libmsn/HISTORY +++ b/chat-libs/libmsn/HISTORY @@ -1,3 +1,6 @@ +2011-05-12 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Only apply openssl-1.0.0.patch for openssl 1.0.0+ + 2011-01-13 Julien "_kaze_" ROZO <julien@rozo.org> * PRE_BUILD, openssl-1.0.0.patch: added a patch to fix compilation issue with openssl version 1.0.0 diff --git a/chat-libs/libmsn/PRE_BUILD b/chat-libs/libmsn/PRE_BUILD index 48c06860cc..1b69874621 100755 --- a/chat-libs/libmsn/PRE_BUILD +++ b/chat-libs/libmsn/PRE_BUILD @@ -1,3 +1,7 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch + +# Only apply with OpenSSL 1.0.0+ +if [[ "$(installed_version openssl|sed 's:[a-z]::g'|sed 's:\.::g'|sed 's:^0::')" -ge "100" ]]; then + patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch +fi |