diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-28 14:18:37 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:15:06 +0000 |
commit | c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2 (patch) | |
tree | 3a8c352036651fbb9579fdd9210f5628bb78cd89 /meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch | |
parent | f73462cdb746afc1bf95b91422315cda62dfdcd1 (diff) | |
download | poky-c2265d0cd59b24d7a364ab7ffc7d6a9755cd83d2.tar.gz |
openssl: Add openssl 1.0
* Thanks to meta-oe for this contribution
* Add Patch Upstream-Status info
* Merged the meta-oe version of openssl-1.0.inc with openssl.inc
* Fix make install parallel issue with PARALLEL_MAKEINST = ""
(From OE-Core rev: ee3ed78af2303ad41993ed34fa7825a74de288c7)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch new file mode 100644 index 0000000000..0f1f392472 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Upstream-Status: Backport [debian] | ||
2 | |||
3 | Index: openssl-1.0.0c/Makefile.org | ||
4 | =================================================================== | ||
5 | --- openssl-1.0.0c.orig/Makefile.org 2010-12-12 16:13:28.000000000 +0100 | ||
6 | +++ openssl-1.0.0c/Makefile.org 2010-12-12 17:01:49.000000000 +0100 | ||
7 | @@ -323,7 +323,8 @@ | ||
8 | echo 'Description: OpenSSL cryptography library'; \ | ||
9 | echo 'Version: '$(VERSION); \ | ||
10 | echo 'Requires: '; \ | ||
11 | - echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ | ||
12 | + echo 'Libs: -L$${libdir} -lcrypto'; \ | ||
13 | + echo 'Libs.private: $(EX_LIBS)'; \ | ||
14 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc | ||
15 | |||
16 | libssl.pc: Makefile | ||
17 | @@ -336,7 +337,8 @@ | ||
18 | echo 'Description: Secure Sockets Layer and cryptography libraries'; \ | ||
19 | echo 'Version: '$(VERSION); \ | ||
20 | echo 'Requires: '; \ | ||
21 | - echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ | ||
22 | + echo 'Libs: -L$${libdir} -lssl'; \ | ||
23 | + echo 'Libs.private: -lcrypto $(EX_LIBS)'; \ | ||
24 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc | ||
25 | |||
26 | openssl.pc: Makefile | ||
27 | @@ -349,7 +351,8 @@ | ||
28 | echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ | ||
29 | echo 'Version: '$(VERSION); \ | ||
30 | echo 'Requires: '; \ | ||
31 | - echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ | ||
32 | + echo 'Libs: -L$${libdir} -lssl -lcrypto'; \ | ||
33 | + echo 'Libs.private: $(EX_LIBS)'; \ | ||
34 | echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc | ||
35 | |||
36 | Makefile: Makefile.org Configure config | ||