Commit 69a0034e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1899 

Submitted by: Doug Kaufman <dkaufman@rahul.net>
Approved by: steve@openssl.org

Mingw fixes.
parent c9a17781

Configure

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ my %table=( 
"BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",



# MinGW

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",

# As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll

# compiled with one compiler with application compiled with another

# compiler. It's possible to engage Applink support in mingw64 build,

Makefile.org

+3 −3
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ install_html_docs: 
				grep -v $$filecase "^$$fn\$$" | \

				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

				 while read n; do \

					$$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

				 done); \

		done; \

	done
@@ -610,7 +610,7 @@ install_docs: 
			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done; \

	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
@@ -627,7 +627,7 @@ install_docs: 
			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done

crypto/camellia/asm/cmll-x86.pl

+1 −1
Original line number Diff line number Diff line
@@ -1133,6 +1133,6 @@ my ($s0,$s1,$s2,$s3) = @T; 
&function_end("Camellia_cbc_encrypt");

}



&asciz("Camellia for x86 by <appro@openssl.org>");

&asciz("Camellia for x86 by <appro\@openssl.org>");



&asm_finish();

util/point.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh



rm -f "$2"

if test "$OSTYPE" = msdosdjgpp; then

if test "$OSTYPE" = msdosdjgpp || test "x$PLATFORM" = xmingw ; then

    cp "$1" "$2"

else

    ln -s "$1" "$2"