diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch b/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch deleted file mode 100644 index 3c77dfcdf0..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/heartbeat-test-private-api.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 2e251ba8feaa696f9408a19336d1fbab148df55e Mon Sep 17 00:00:00 2001 | ||
2 | From: Kurt Roeckx <kurt@roeckx.be> | ||
3 | Date: Sat, 7 Jun 2014 13:32:23 +0200 | ||
4 | Subject: [PATCH] Link heartbeat_test with the static version of the libraries | ||
5 | |||
6 | It's using an internal API that that might not be available in the shared | ||
7 | library. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/125] | ||
10 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
11 | |||
12 | --- | ||
13 | test/Makefile | 9 ++++++++- | ||
14 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/test/Makefile b/test/Makefile | ||
17 | index f1816ac..1dd7bb9 100644 | ||
18 | --- a/test/Makefile | ||
19 | +++ b/test/Makefile | ||
20 | @@ -420,6 +420,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ | ||
21 | LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ | ||
22 | link_app.$${shlib_target} | ||
23 | |||
24 | +BUILD_CMD_STATIC=shlib_target=; \ | ||
25 | + LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \ | ||
26 | + $(MAKE) -f $(TOP)/Makefile.shared -e \ | ||
27 | + APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ | ||
28 | + LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ | ||
29 | + link_app.$${shlib_target} | ||
30 | + | ||
31 | $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) | ||
32 | @target=$(RSATEST); $(BUILD_CMD) | ||
33 | |||
34 | @@ -618,7 +625,7 @@ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) | ||
35 | @target=$(V3NAMETEST); $(BUILD_CMD) | ||
36 | |||
37 | $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) | ||
38 | - @target=$(HEARTBEATTEST); $(BUILD_CMD) | ||
39 | + @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) | ||
40 | |||
41 | #$(AESTEST).o: $(AESTEST).c | ||
42 | # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c | ||
43 | -- | ||
44 | 1.9.3 | ||
45 | |||