Commit 393b704d authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Minimal work-around for ./engine shared builds. "Minimal" means that I 

think that proper Makefile clean-up is required.
parent bef26f11

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ all: Makefile.ssl build_all openssl.pc 
BUILD_CMD=if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \

	if [ -d "$$dir" ]; then \

		(cd $$dir && echo "making $$target in $$dir..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' $$target ) || exit 1; \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' SHARED_LDFLAGS='${SHARED_LDFLAGS}' LIBRPATH='$(INSTALLTOP)/lib' $$target ) || exit 1; \

	else \

		$(MAKE) $$dir; \

	fi; fi

Makefile.shared

+7 −9
Original line number Diff line number Diff line
@@ -583,15 +583,13 @@ link_app.irix: 
	fi; \

	$(LINK_APP)



# HP-UX includes the full pathname of libs we depend on, so we would get

# ./libcrypto (with ./ as path information) compiled into libssl, hence

# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto

# anyway.

# The object modules are loaded from lib$i.a using the undocumented -Fl

# option.

#

# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH

#          by temporarily specifying "+s"!

# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so

# we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite

# rules imply that we can only link one level down in catalog structure,

# but that's what takes place for the moment of this writing. +cdp option

# was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link

# editor context only [it's simply ignored in other cases, which are all

# ELFs by the way].

#

link_o.hpux:

	@if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \

engines/Makefile.ssl

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ lib: $(LIBOBJ) 
			$(NEWMAKE) -f ../Makefile.shared \

				CC="$(CC)" LIBNAME=$$l LIBEXTRAS=e_$$l.o \

				LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \

				CFLAG="$(CFLAG)" LDFLAGS="$(LDFLAGS)" \

				SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \

				PLATFORM="$(PLATFORM)" \

				link_o.$(SHLIB_TARGET); \

		done; \

	else \