Revision: 23775
http://sourceforge.net/p/gar/code/23775
Author: chninkel
Date: 2014-06-08 12:45:33 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------
openssl1/trunk: update heartbeat_test static linking patch so that it can be
applied on the Opencsw build
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
Modified:
csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
===================================================================
---
csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
2014-06-08 12:00:02 UTC (rev 23774)
+++
csw/mgar/pkg/openssl1/trunk/files/0011-link-heartbeat_test-with-static-libraries.patch
2014-06-08 12:45:33 UTC (rev 23775)
@@ -10,10 +10,10 @@
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/test/Makefile b/test/Makefile
-index f1816ac..1dd7bb9 100644
+index 005f2e8..d68e8b0 100644
--- a/test/Makefile
+++ b/test/Makefile
-@@ -420,6 +420,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then
\
+@@ -358,6 +358,13 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then
\
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
link_app.$${shlib_target}
@@ -24,12 +24,12 @@
+ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+ link_app.$${shlib_target}
+
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
- @target=$(RSATEST); $(BUILD_CMD)
+ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+ shlib_target="$(SHLIB_TARGET)"; \
+ fi; \
+@@ -476,7 +483,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+ @target=$(SRPTEST); $(BUILD_CMD)
-@@ -618,7 +625,7 @@ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
- @target=$(V3NAMETEST); $(BUILD_CMD)
-
$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
- @target=$(HEARTBEATTEST); $(BUILD_CMD)
+ @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
@@ -38,4 +38,3 @@
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
--
1.9.3
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
