diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-09-22 09:16:00 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-22 09:18:51 +0200 |
| commit | bf7ed409c4118528920a633f9108fe775e176b12 (patch) | |
| tree | 96b128da8fff6860f7e2d4d58d1f5aadacbe6d0a /meta-oe/recipes-connectivity | |
| parent | c47fb2187eba3f20a777b4aab2e8b10ac6a7e7dc (diff) | |
| download | meta-openembedded-contrib-bf7ed409c4118528920a633f9108fe775e176b12.tar.gz | |
openssl 1.0.0e: fix up link patch and make 1.0.0e the default openssl
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-connectivity')
| -rw-r--r-- | meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb | 4 |
2 files changed, 19 insertions, 12 deletions
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch index 6522d83896..154106cbcd 100644 --- a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch +++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch @@ -1,14 +1,20 @@ -Upstream-Status: Pending - -fix the parallel build regarding shared libraries. +From aabfb6f78af8e337d3239142117ba303fce55e7e Mon Sep 17 00:00:00 2001 +From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> +Date: Thu, 22 Sep 2011 08:55:26 +0200 +Subject: [PATCH] fix the parallel build regarding shared libraries. -Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> +Upstream-Status: Pending +--- + .../openssl-1.0.0e/Makefile.org | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) -Index: openssl-1.0.0d/Makefile.org -=================================================================== ---- openssl-1.0.0d.orig/Makefile.org 2011-09-01 17:03:59.000000000 +0400 -+++ openssl-1.0.0d/Makefile.org 2011-09-01 17:12:24.000000000 +0400 -@@ -244,13 +244,13 @@ +diff --git a/Makefile.org +index 3c7aea1..6326cd6 100644 +--- a/Makefile.org ++++ b/Makefile.org +@@ -243,13 +243,13 @@ build_libs: build_crypto build_ssl build_engines + + build_crypto: @dir=crypto; target=all; $(BUILD_ONE_CMD) -build_ssl: +build_ssl: build_crypto @@ -24,3 +30,6 @@ Index: openssl-1.0.0d/Makefile.org @dir=test; target=all; $(BUILD_ONE_CMD) build_tools: @dir=tools; target=all; $(BUILD_ONE_CMD) +-- +1.6.6.1 + diff --git a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb index 9a22632bbe..bc812d37ae 100644 --- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb +++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb @@ -6,12 +6,10 @@ DEPENDS += "ocf-linux" CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" -DEFAULT_PREFERENCE = "-1" - export DIRS = "crypto ssl apps engines" export OE_LDFLAGS="${LDFLAGS}" |