Mercurial > mxe-octave

diff src/openssl.mk @ 4570:ddd228f155af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
openssl: update to v1.0.2m * src/openssl-1-fixes.patch: update from mxe.cc * src/openssl.mk: update version, checksum * src/mingw-openssl-3-libdeps.patch: removed file * dist-files.mk: remove ref to mingw-openssl-3-libdeps.patch
author John D
date Tue, 05 Dec 2017 07:53:05 -0500
parents 09ad2f46e0b7
children
line wrap: on
line diff
--- a/src/openssl.mk	Mon Dec 04 16:47:54 2017 -0500
+++ b/src/openssl.mk	Tue Dec 05 07:53:05 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := openssl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.1k
-$(PKG)_CHECKSUM := 19d818e202558c212a9583fcdaf876995a633ddf
+$(PKG)_VERSION  := 1.0.2m
+$(PKG)_CHECKSUM := 27fb00641260f97eaa587eb2b80fab3647f6013b
 $(PKG)_SUBDIR   := openssl-$($(PKG)_VERSION)
 $(PKG)_FILE     := openssl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.openssl.org/source/$($(PKG)_FILE)
@@ -26,6 +26,7 @@
 else
   $(PKG)_CROSS_COMPILE_MAKE_ARG := CROSS_COMPILE='$(MXE_TOOL_PREFIX)'
   $(PKG)_CC := $(MXE_CC)
+  $(PKG)_RC := $(MXE_WINDRES)
   ifeq ($(TARGET),x86_64-w64-mingw32)
     $(PKG)_CONFIGURE := ./Configure mingw64
   else
@@ -41,7 +42,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && CC='$($(PKG)_CC)' \
+    cd '$(1)' && CC='$($(PKG)_CC)' RC='$($(PKG)_RC)' \
         $($(PKG)_CONFIGURE) \
         zlib \
         shared \