Mercurial > mxe-octave

changeset 3427:d323fdd9e258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
limit openssl-3-libdeps.patch to mingw and msvc only.
author John W. Eaton <jwe@octave.org>
date Tue, 14 Jan 2014 00:14:57 -0500
parents b3554ecfaff2
children 652d7ef34921
files src/mingw-openssl-3-libdeps.patch src/msvc-openssl-3-libdeps.patch src/openssl-3-libdeps.patch
diffstat 3 files changed, 24 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-openssl-3-libdeps.patch	Tue Jan 14 00:14:57 2014 -0500
@@ -0,0 +1,12 @@
+diff -ur a/engines/ccgost/Makefile b/engines/ccgost/Makefile
+--- a/engines/ccgost/Makefile	2013-02-11 10:26:04.000000000 -0500
++++ b/engines/ccgost/Makefile	2013-10-14 13:38:18.595806411 -0400
+@@ -32,7 +32,7 @@
+ 		$(MAKE) -f $(TOP)/Makefile.shared -e \
+ 			LIBNAME=$(LIBNAME) \
+ 			LIBEXTRAS='$(LIBOBJ)' \
+-			LIBDEPS='-L$(TOP) -lcrypto' \
++			LIBDEPS='-L$(TOP) -lcrypto -lgdi32' \
+ 			link_o.$(SHLIB_TARGET); \
+ 	else \
+ 		$(AR) $(LIB) $(LIBOBJ); \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-openssl-3-libdeps.patch	Tue Jan 14 00:14:57 2014 -0500
@@ -0,0 +1,12 @@
+diff -ur a/engines/ccgost/Makefile b/engines/ccgost/Makefile
+--- a/engines/ccgost/Makefile	2013-02-11 10:26:04.000000000 -0500
++++ b/engines/ccgost/Makefile	2013-10-14 13:38:18.595806411 -0400
+@@ -32,7 +32,7 @@
+ 		$(MAKE) -f $(TOP)/Makefile.shared -e \
+ 			LIBNAME=$(LIBNAME) \
+ 			LIBEXTRAS='$(LIBOBJ)' \
+-			LIBDEPS='-L$(TOP) -lcrypto' \
++			LIBDEPS='-L$(TOP) -lcrypto -lgdi32' \
+ 			link_o.$(SHLIB_TARGET); \
+ 	else \
+ 		$(AR) $(LIB) $(LIBOBJ); \
--- a/src/openssl-3-libdeps.patch	Tue Jan 14 00:12:46 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ur a/engines/ccgost/Makefile b/engines/ccgost/Makefile
---- a/engines/ccgost/Makefile	2013-02-11 10:26:04.000000000 -0500
-+++ b/engines/ccgost/Makefile	2013-10-14 13:38:18.595806411 -0400
-@@ -32,7 +32,7 @@
- 		$(MAKE) -f $(TOP)/Makefile.shared -e \
- 			LIBNAME=$(LIBNAME) \
- 			LIBEXTRAS='$(LIBOBJ)' \
--			LIBDEPS='-L$(TOP) -lcrypto' \
-+			LIBDEPS='-L$(TOP) -lcrypto -lgdi32' \
- 			link_o.$(SHLIB_TARGET); \
- 	else \
- 		$(AR) $(LIB) $(LIBOBJ); \