diff options
| author | lumag <dbaryshkov@gmail.com> | 2011-09-16 23:39:44 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-17 10:32:50 +0200 |
| commit | 3f546ada2c5baeea4d0fe6d4dd73797cdefa73da (patch) | |
| tree | abb73c71e6d612fcae0f1a563442accf7198f702 /meta-oe | |
| parent | f7f679a7c6f0e4df308e09af907b00f27fb0ad5d (diff) | |
| download | meta-openembedded-3f546ada2c5baeea4d0fe6d4dd73797cdefa73da.tar.gz | |
openssl: fixup the openssl-fix-link patch
Include more dependencies into openssl-fix-link.patch patch.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch | 14 | ||||
| -rw-r--r-- | meta-oe/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 | |||
| 8 | =================================================================== | 8 | =================================================================== |
| 9 | --- openssl-1.0.0d.orig/Makefile.org 2011-09-01 17:03:59.000000000 +0400 | 9 | --- openssl-1.0.0d.orig/Makefile.org 2011-09-01 17:03:59.000000000 +0400 |
| 10 | +++ openssl-1.0.0d/Makefile.org 2011-09-01 17:12:24.000000000 +0400 | 10 | +++ openssl-1.0.0d/Makefile.org 2011-09-01 17:12:24.000000000 +0400 |
| 11 | @@ -246,9 +246,9 @@ | 11 | @@ -244,13 +244,13 @@ |
| 12 | @dir=crypto; target=all; $(BUILD_ONE_CMD) | 12 | @dir=crypto; target=all; $(BUILD_ONE_CMD) |
| 13 | build_ssl: | 13 | -build_ssl: |
| 14 | +build_ssl: build_crypto | ||
| 14 | @dir=ssl; target=all; $(BUILD_ONE_CMD) | 15 | @dir=ssl; target=all; $(BUILD_ONE_CMD) |
| 15 | -build_engines: | 16 | -build_engines: |
| 16 | +build_engines: build_crypto | 17 | +build_engines: build_crypto |
| 17 | @dir=engines; target=all; $(BUILD_ONE_CMD) | 18 | @dir=engines; target=all; $(BUILD_ONE_CMD) |
| 18 | -build_apps: | 19 | -build_apps: |
| 19 | +build_apps: build_crypto | 20 | +build_apps: build_crypto build_ssl |
| 20 | @dir=apps; target=all; $(BUILD_ONE_CMD) | 21 | @dir=apps; target=all; $(BUILD_ONE_CMD) |
| 21 | build_tests: | 22 | -build_tests: |
| 22 | @dir=test; target=all; $(BUILD_ONE_CMD) | 23 | +build_tests: build_crypto build_ssl |
| 24 | @dir=test; target=all; $(BUILD_ONE_CMD) | ||
| 25 | build_tools: | ||
| 26 | @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" | |||
| 6 | 6 | ||
| 7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" | 7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" |
| 8 | 8 | ||
| 9 | PR = "${INC_PR}.0" | 9 | PR = "${INC_PR}.1" |
| 10 | 10 | ||
| 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" |
| 12 | 12 | ||