diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-10-06 11:19:05 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-10-07 20:22:29 +0200 |
| commit | d7c12fd07498af06f4c03182c838528e765e4721 (patch) | |
| tree | 8b5c098888908d9099be93d805499dcfcff5917b /meta-oe | |
| parent | 2f04e069cba8d2a9fc9e640e8ddccc5929abff11 (diff) | |
| download | meta-openembedded-contrib-d7c12fd07498af06f4c03182c838528e765e4721.tar.gz | |
openssl: Fix build with gold linker
There was a missing version script for one of
the apps that was being flagged by gold. So we
add appropriate openssl.ld for engines/ccgost
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Roman Khimov <khimov@altell.ru>
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/debian/version-script.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/openssl/openssl_1.0.0e.bb | 2 |
2 files changed, 27 insertions, 9 deletions
diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch index 9d73f31611..6d73a4c8a7 100644 --- a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch +++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch @@ -1,7 +1,7 @@ -Index: openssl-1.0.0c/Configure +Index: openssl-1.0.0e/Configure =================================================================== ---- openssl-1.0.0c.orig/Configure 2011-08-12 23:02:54.436331036 -0700 -+++ openssl-1.0.0c/Configure 2011-08-12 23:03:39.626397324 -0700 +--- openssl-1.0.0e.orig/Configure 2011-10-04 22:49:47.599379260 -0700 ++++ openssl-1.0.0e/Configure 2011-10-04 22:49:53.263407376 -0700 @@ -1486,6 +1486,8 @@ } } @@ -11,10 +11,10 @@ Index: openssl-1.0.0c/Configure open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new"; open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n"; -Index: openssl-1.0.0c/openssl.ld +Index: openssl-1.0.0e/openssl.ld =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.0.0c/openssl.ld 2011-08-12 23:03:39.626397324 -0700 ++++ openssl-1.0.0e/openssl.ld 2011-10-04 22:49:53.295407572 -0700 @@ -0,0 +1,4461 @@ +OPENSSL_1.0.0 { + global: @@ -4477,14 +4477,32 @@ Index: openssl-1.0.0c/openssl.ld + *; +}; + -Index: openssl-1.0.0c/engines/openssl.ld +Index: openssl-1.0.0e/engines/openssl.ld =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ openssl-1.0.0c/engines/openssl.ld 2011-08-12 23:03:39.626397324 -0700 -@@ -0,0 +1,7 @@ ++++ openssl-1.0.0e/engines/openssl.ld 2011-10-04 22:49:53.295407572 -0700 +@@ -0,0 +1,10 @@ +OPENSSL_1.0.0 { + global: + bind_engine; ++ v_check; ++ OPENSSL_init; ++ OPENSSL_finish; ++ local: ++ *; ++}; ++ +Index: openssl-1.0.0e/engines/ccgost/openssl.ld +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ openssl-1.0.0e/engines/ccgost/openssl.ld 2011-10-04 22:49:53.339407745 -0700 +@@ -0,0 +1,10 @@ ++OPENSSL_1.0.0 { ++ global: ++ bind_engine; ++ v_check; ++ OPENSSL_init; ++ OPENSSL_finish; + local: + *; +}; 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 bc812d37ae..8fcf0ff545 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}.2" +PR = "${INC_PR}.3" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" |