Michal,
>Do you really expect me to break my Win32 builds in order to restore
> seamless integration with your build environment?
No way!... I already changed the mingw.mak make included in stunnel source to
handle the new condition following Pierre Delaage style. Works for me. It could
be useful for someone else (attached).
Incidentally, I just found that in this case, including applink.c is not
mandatory. Stunnel compiles and runs just fine without it. I understand it's
only need it if your application will link to and OpenSSL DLL compiled with
different settings or compiler (from the OpenSSL FAQ). Not including it makes
saves about 7KB on the final exe.
Regards,Jose
On Thursday, November 5, 2015 8:11 AM, Michal Trojnara
<[email protected]> wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
On 05.11.2015 12:36, Jose Alf. wrote:
> Mostly, you figured out the issue. I use the mingw.mak recipe
> included in the src directory to compile my own stunnel with
> mingw32. However, there was a change in stunnel 5.25 affecting
> stunnel.c that breaks compilation with this makefile. See attached
> diff. I know you don't compile under windows, but please consider
> reverting that change to retain backward compatibility.
Do you really expect me to break my Win32 builds in order to restore
seamless integration with your build environment?
> Thanks a lot for sharing your build scripts on Linux.
The last line of my script is also the solution to your problem.
Best regards,
Mike
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJWO1VYAAoJEC78f/DUFuAUuYoQAJrtBSuC60TX70J9NoQspiya
nVKX2DHLtY9PDrS56PhZ6OmBtxkzVQSWY16Tbl/a4+HFdbBWBA1M02a+YedykHBv
Y13pLFEVngpz01QY3jp8Oygi0VUihFHTEJR2LZGWUUsox+1DPxx2TamgEaVH4jk0
uwxbDeVCO4i64zmt0Zc5FIca+S4MtXcelf57xAwb8tcH4Cs3r73PHaoScM3uITzV
7/k6Frm+v9GAPK/M10oCOX2PraVN0WpJQ34FZMnuF5y6Ifg7LjWXmcC7/aH4PIop
IyHI0vbU9yfrdrAC3t+JJkWdU3VRFH2RK4S8MNP+4AgXOOUK7hQFYs3eTR6lRKMi
tHFk3TuLUvDhzBMsYwtQ4nAnEIWERnDHHTulq+baTiMh54Td+s0aDIi7A6LbvyGg
Gy7U7ilRRX1FK7uw3Ydtr3/JLiJCSvAy2rd4GtWKVeSIpU/f3l8Gh4mqt4KpWQvX
H7iuo5ORAsyV3784nq9Mlwu+cLrKds1CHjy6j1JgFkRw6qpUOr2sm5/EhKSaAwhX
+1hDfzuYWeFeZ8t3sHKgXo4oBWk9gSNje9nqGhmglr7mzqq46gpUHAR3C6ZhRVKk
zyKeulNK/5jL/BHpG3T3QF2j3tRVaaF7HCoeuTQdS/0tE5T7ucnMhFIvA5Ou/wBP
HMOjuwSkXweirxf6kSYa
=fReE
-----END PGP SIGNATURE-----
_______________________________________________
stunnel-users mailing list
[email protected]
https://www.stunnel.org/cgi-bin/mailman/listinfo/stunnel-users
# Simple Makefile.w32 for stunnel.exe by Michal Trojnara 1998-2007
#
# Modified by Brian Hatch ([email protected])
# 20101030 pdelaage:
# + multi-HOST management (if used on Windows host or Linux Host)
# + lack of gnu-win32 (rm) detection
# note: rm is used INTERNALLY by gcc for deletion if intermediate files.
# This makefile is only tested on the mingw compiler. Mingw can successfully
# compile both openssl and stunnel. If you want to use another compiler, give
# it a shot, and tell us how it went.
# pdelaage : THIS makefile can be used with mingw-make on Windows or gnu make
# on Linux, to produce the Win32 version of stunnel (target is win32). It
# requires, on Windows, the use of gnu-win32 tools: rm, mkdir, rmdir that
# manages files and dirs BOTH on linux and Windows with / as path separator.
# Note: Native windows equivalent, del and mkdir/rmdir, badly manage / and \,
# so they cannot be used here.
# On Windows host, download:
# http://gnuwin32.sourceforge.net/downlinks/coreutils.php
# if you have forgotten this, this makefile will remind you...
# Modify this to point to your actual openssl compile directory
# (You did already compile openssl, didn't you???)
SSLDIR=../../openssl-0.9.8zg
# For mingw compiled openssl
SSLINC=$(SSLDIR)/outinc
SSLLIBS=-L$(SSLDIR)/out -leay32 -lssl32
# For MSVC compiled openssl
#SSLINC=$(SSLDIR)/inc32
#SSLLIBS=-L$(SSLDIR)/out32dll -lssleay32 -llibeay32
# c:\, backslash is not correctly recognized by mingw32-make, produces some
# "missing separator" issue.
# pdelaage: simple trick to detect if we are using mingw-gcc on a Windows host,
# or on a linux host. windir is a system environment variable on windows NT
# and above, and then redefine some macros.
# note: ifdef is !IFDEF in MS nmake or Borland make.
# $(info is !MESSAGE in MS nmake or Borland make.
ifdef windir
$(info host machine is a Windows machine )
NULLDEV=NUL
MKDIR="C:\Program Files\GnuWin32\bin\mkdir.exe"
DELFILES="C:\Program Files\GnuWin32\bin\rm.exe" -f
DELDIR="C:\Program Files\GnuWin32\bin\rm.exe" -rf
COPYFILES="C:\Program Files\GnuWin32\bin\cp.exe" -f
else
$(info host machine is a linux machine )
NULLDEV=/dev/null
MKDIR=mkdir
DELFILES=rm -f
DELDIR=rm -rf
COPYFILES=cp -f
endif
TARGETCPU=MGW32
SRC=../src
OBJROOT=../obj
OBJ=$(OBJROOT)/$(TARGETCPU)
BINROOT=../bin
BIN=$(BINROOT)/$(TARGETCPU)
OBJS=$(OBJ)/stunnel.o $(OBJ)/ssl.o $(OBJ)/ctx.o $(OBJ)/verify.o \
$(OBJ)/file.o $(OBJ)/client.o $(OBJ)/protocol.o $(OBJ)/sthreads.o \
$(OBJ)/log.o $(OBJ)/options.o $(OBJ)/network.o $(OBJ)/resolver.o \
$(OBJ)/ui_win_gui.o $(OBJ)/resources.o $(OBJ)/str.o $(OBJ)/tls.o \
$(OBJ)/fd.o $(OBJ)/dhparam.o $(OBJ)/cron.o
CC=gcc
RC=windres
# pdelaage note: as a workaround for windres bug on resources.rc, equivalent to
# "use a temp file instead of popen" option between cpp and windres!
RCP=gcc -E -xc-header -DRC_INVOKED
DEFINES=-D_WIN32_WINNT=0x0501
# some preprocessing debug : $(info DEFINES is $(DEFINES) )
CFLAGS=-g -O2 -Wall $(DEFINES) -I$(SSLINC)
# RFLAGS, note of pdelaage: windres accepts -fo for compatibility with ms tools
# default options : -J rc -O coff, input rc file, output coff file.
RFLAGS=-v --use-temp-file $(DEFINES)
# following RFLAGS2 useful if one day use-temp-file does not exist anymore
RFLAGS2=-v $(DEFINES)
LDFLAGS=-s
LIBS=$(SSLLIBS) -lws2_32 -lpsapi -lgdi32 -lcrypt32
# IMPORTANT pdelaage : restore this if you need (but I do not see why) -lzdll
$(OBJ)/%.o: $(SRC)/%.c
$(CC) $(CFLAGS) -o$@ -c $<
$(OBJ)/%.o: $(SRC)/%.cpp
$(CC) $(CFLAGS) -o$@ -c $<
$(OBJ)/%.o: $(SRC)/%.rc
$(RC) $(RFLAGS) -o$@ $<
# pdelaage : trick for windres preprocessing popen bug on Windows, in case the
windres option
# use_temp_file disappear one day...
# comment out the $(RC) rule above to activate the following
$(OBJ)/%.rcp: $(SRC)/%.rc
$(RCP) $(DEFINES) -o$@ $<
$(OBJ)/%.o: $(OBJ)/%.rcp
$(RC) $(RFLAGS2) -o$@ $<
# Note : gnu-make will automatically RM the intermediate "rcp" file
# BUT it will ABSOLUTELY NEED the "rm" command available : not a problem on
linux
# but on a windows dev host machine, one will need to install gnu-win32/rm
command
# in the system...
# for debug of the preprocessed rcp file, because it is automatically deleted
by gnu-make: cp $< $<.2
all: testenv makedirs $(BIN)/stunnel.exe
testopenssl:
@if not exist $(SSLDIR) echo You mush have a compiled OpenSSL tree
@if not exist $(SSLINC)/openssl/applink.c $(COPYFILES)
$(SSLDIR)/ms/applink.c $(SSLINC)/openssl
#pdelaage : testenv purpose is to detect, on windows, whether Gnu-win32 has
been properly installed...
# a first call to "true" is made to detect availability, a second is made to
stop the make process.
ifdef windir
testenv: testopenssl
-@ echo OFF
-@ true >$(NULLDEV) 2>&1 || echo You MUST install Gnu-Win32 coreutils \
from http://gnuwin32.sourceforge.net/downlinks/coreutils.php \
and set PATH to include C:\Program Files\GnuWin32\bin
@true >$(NULLDEV) 2>&1
else
testenv:
-@ true >$(NULLDEV) 2>&1 || echo Your system lacks Gnu coreutils tools
!!!
@true >$(NULLDEV) 2>&1
endif
clean:
-@ $(DELFILES) $(OBJ)/*.o
-@ $(DELFILES) $(BIN)/stunnel.exe >$(NULLDEV) 2>&1
-@ $(DELDIR) $(OBJ) >$(NULLDEV) 2>&1
-@ $(DELDIR) $(BIN) >$(NULLDEV) 2>&1
makedirs:
-@ $(MKDIR) $(OBJROOT) >$(NULLDEV) 2>&1
-@ $(MKDIR) $(OBJ) >$(NULLDEV) 2>&1
-@ $(MKDIR) $(BINROOT) >$(NULLDEV) 2>&1
-@ $(MKDIR) $(BIN) >$(NULLDEV) 2>&1
# pseudo-target for RC-preprocessor debugging
# result appears OK, as a text file
faketest:
gcc -E -xc-header -DRC_INVOKED $(DEFINES) -o $(SRC)/resources.rcp
$(SRC)/resources.rc
$(OBJS): *.h mingw.mak
$(BIN)/stunnel.exe: $(OBJS)
$(CC) $(LDFLAGS) -o $(BIN)/stunnel.exe $(OBJS) $(LIBS) -mwindows
# "missing separator" issue with mingw32-make: tabs MUST BE TABS in your text
# editor, and not set of spaces even if your development host is windows.
# Some \ are badly tolerated by mingw32-make "!" directives, eg as !IF,
# accepted in MS nmake and Borland make ARE NOT supported by gnu make but they
# all have their equivalents.
# Gnu-make is case sensitive, while ms nmake or borland make are not. Anyway,
# on reference to env vars nmake convert env vars to UPPERCASE macro names...
_______________________________________________
stunnel-users mailing list
[email protected]
https://www.stunnel.org/cgi-bin/mailman/listinfo/stunnel-users
