summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien ROZO2011-05-30 11:24:00 +0200
committerJulien ROZO2011-05-30 11:24:00 +0200
commitcd828a6278c30120296b5197ecd343cf0ae719d2 (patch)
treea18a87c68ffb9635e9ba4c664386843bd3aa177b
parent5fb4d10ac0650dce13eb82639a56f6a0d25a9451 (diff)
qca-tls: openssl patch for version 1.0.0+ is to be applied only if
openssl installed version is at least 1.0.0
-rw-r--r--crypto/qca-tls/HISTORY3
-rwxr-xr-xcrypto/qca-tls/PRE_BUILD4
2 files changed, 6 insertions, 1 deletions
diff --git a/crypto/qca-tls/HISTORY b/crypto/qca-tls/HISTORY
index 7788b0f3d1..945a72a0d0 100644
--- a/crypto/qca-tls/HISTORY
+++ b/crypto/qca-tls/HISTORY
@@ -1,3 +1,6 @@
+2011-05-30 Julien "_kaze_" ROZO <julien@rozo.org>
+ * PRE_BUILD: openssl patch is to be applied only if version 1.0.0+ is installed
+
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/crypto/qca-tls/PRE_BUILD b/crypto/qca-tls/PRE_BUILD
index 48c06860cc..6d2b7e88f2 100755
--- a/crypto/qca-tls/PRE_BUILD
+++ b/crypto/qca-tls/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+if spell_ok openssl && [[ $(installed_version openssl) > 1.0.0 ]]; then
+ patch -p1 < $SPELL_DIRECTORY/openssl-1.0.0.patch
+fi