From 3f546ada2c5baeea4d0fe6d4dd73797cdefa73da Mon Sep 17 00:00:00 2001 From: lumag Date: Fri, 16 Sep 2011 23:39:44 +0000 Subject: [PATCH] openssl: fixup the openssl-fix-link patch Include more dependencies into openssl-fix-link.patch patch. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Koen Kooi --- .../openssl/openssl-1.0.0e/openssl-fix-link.patch | 14 +++++++++----- .../recipes-connectivity/openssl/openssl_1.0.0e.bb | 2 +- 2 files changed, 10 insertions(+), 6 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 b319c62f42..15762a706c 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 @@ -8,15 +8,19 @@ 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 -@@ -246,9 +246,9 @@ +@@ -244,13 +244,13 @@ @dir=crypto; target=all; $(BUILD_ONE_CMD) - build_ssl: +-build_ssl: ++build_ssl: build_crypto @dir=ssl; target=all; $(BUILD_ONE_CMD) -build_engines: +build_engines: build_crypto @dir=engines; target=all; $(BUILD_ONE_CMD) -build_apps: -+build_apps: build_crypto ++build_apps: build_crypto build_ssl @dir=apps; target=all; $(BUILD_ONE_CMD) - build_tests: - @dir=test; target=all; $(BUILD_ONE_CMD) +-build_tests: ++build_tests: build_crypto build_ssl + @dir=test; target=all; $(BUILD_ONE_CMD) + build_tools: + @dir=tools; target=all; $(BUILD_ONE_CMD) 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 28039ca97b..9a22632bbe 100644 --- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb +++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb @@ -6,7 +6,7 @@ DEPENDS += "ocf-linux" CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"