Commit 5b50f99e authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Further mingw build procedure updates.

parent b8994b61

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ 
		CC='${CC}' CFLAG='${CFLAG}' 			\

		AS='${CC}' ASFLAG='${CFLAG} -c'			\

		AR='${AR}' NM='${NM}' RANLIB='${RANLIB}'	\

		CROSS_COMPILE_PREFIX='${CROSS_COMPILE_PREFIX}'	\

		PERL='${PERL}'					\

		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\

		INSTALL_PREFIX='${INSTALL_PREFIX}'		\

Makefile.shared

+19 −10
Original line number Diff line number Diff line
@@ -255,28 +255,37 @@ link_o.cygwin: 
	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-s,-Bsymbolic"; \

	$(LINK_SO_O)

link_a.cygwin:

	@ $(CALC_VERSIONS); \

	INHIBIT_SYMLINKS=yes; \

	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); def=; \

	SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \

	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \

	if expr $(PLATFORM) : 'mingw' > /dev/null; then \

		SHLIB=$(LIBNAME); SHLIB_SOVER=32; \

		def="$(LIBNAME).def"; \

		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$def; \

		extras="$(LIBNAME).def"; \

		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \

	fi; \

	SHLIB_SUFFIX=.dll; \

	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \

	$(PERL) util/mkrc.pl $$dll_name | \

		$(CROSS_COMPILE_PREFIX)windres -o rc.o; \

	extras="$$extras rc.o"; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$def"; \

	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \

	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \

	[ -f apps/$$dll_name ] && rm apps/$$dll_name; \

	[ -f test/$$dll_name ] && rm test/$$dll_name; \

	$(LINK_SO_A) || exit 1; \

	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \

	cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/

	rm $$extras; \

	cp -p $$dll_name apps/; \

	cp -p $$dll_name test/

link_app.cygwin:

	@if expr "$(CFLAGS)" : '.*OPENSSL_USE_APPLINK' > /dev/null; then \

		LIBDEPS="$(TOP)/crypto/applink.o $${LIBDEPS:-$(LIBDEPS)}"; \

		export LIBDEPS; \

	fi; \

	$(LINK_APP)



link_o.alpha-osf1:

apps/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ dclean: 
	rm -f CA.pl



clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

	rm -f *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE)

	rm -f req



$(DLIBSSL):

crypto/Makefile

+7 −4
Original line number Diff line number Diff line
@@ -64,11 +64,14 @@ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl 
x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@



uplink.o:	../ms/uplink.c

	$(CC) $(CFLAGS) -c -o $@ ../ms/uplink.c

applink.o:	$(TOP)/ms/applink.c

	$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/applink.c



uplink-cof.s:	../ms/uplink.pl

	$(PERL) ../ms/uplink.pl coff > $@

uplink.o:	$(TOP)/ms/uplink.c applink.o

	$(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c



uplink-cof.s:	$(TOP)/ms/uplink.pl

	$(PERL) $(TOP)/ms/uplink.pl coff > $@



x86_64cpuid.s: x86_64cpuid.pl

	$(PERL) x86_64cpuid.pl $@

test/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ dclean: 
			testreq.pem



clean:

	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest

	rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest



$(DLIBSSL):

	(cd ..; $(MAKE) DIRS=ssl all)