Commit 69c922f5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Some find it confusing that environment variables are set when shared 

libraries aren't built or used.  I can see the point, so I'm
reorganising a little for clarity.
parent 10c85057

Makefile.org

+21 −19
Original line number Diff line number Diff line
@@ -404,14 +404,16 @@ rehash: rehash.time 
rehash.time: certs

	@(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \

	  export OPENSSL OPENSSL_DEBUG_MEMORY; \

	  if [ -n "$(SHARED_LIBS)" ]; then \

	    LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

	    DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \

	    SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \

	    LIBPATH="`pwd`:$$LIBPATH"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

	    if [ "$(PLATFORM)" = "Cygwin" ]; then \

	      PATH="`pwd`:$$PATH"; \

	    fi; \

	    LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

	    export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	    export LD_PRELOAD; \

	  fi; \

	  $(PERL) tools/c_rehash certs)
@@ -422,14 +424,14 @@ test: tests 
tests: rehash

	@(cd test && echo "testing..." && \

	$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );

	@LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

	@if [ -n "$(SHARED_LIBS)" ]; then \

	  LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

	  DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \

	  SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \

	  LIBPATH="`pwd`:$$LIBPATH"; \

	  if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

	export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	if [ -n "$(SHARED_LIBS)" ]; then \

	  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

	  export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	  export LD_PRELOAD; \

	fi; \

	apps/openssl version -a

apps/Makefile.ssl

+15 −12
Original line number Diff line number Diff line
@@ -169,15 +169,18 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \

		LIBRPATH=$(INSTALLTOP)/lib \

		link_app.$${shlib_target}

	-(cd ..; OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \

	-(cd ..; 

	  if [ -n "$(SHARED_LIBS)" ]; then \

	    OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \

	    LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \

	    DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \

	    SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \

	    LIBPATH="`pwd`:$$LIBPATH"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

	    if [ "$(PLATFORM)" = "Cygwin" ]; then \

	      PATH="`pwd`:$$PATH"; \

	    fi; \

	    LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

	    export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	    export LD_PRELOAD; \

	  fi; \

	  $(PERL) tools/c_rehash certs)

test/Makefile.ssl

+14 −11
Original line number Diff line number Diff line
@@ -131,15 +131,18 @@ tests: exe apps $(TESTS) 
apps:

	@(cd ..; $(MAKE) DIRS=apps all)



SET_SO_PATHS=OSSL_LIBPATH="`cd ..; pwd`"; \

SET_SO_PATHS=\

	if [ -n "$(SHARED_LIBS)" ]; then \

	  OSSL_LIBPATH="`cd ..; pwd`"; \

	  LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \

	  DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \

	  SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \

	  LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \

		if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \

		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

		if [ -n "$(SHARED_LIBS)" ]; then \

	  if [ "$(PLATFORM)" = "Cygwin" ]; then \

	    PATH="$${LIBPATH}:$$PATH"; \

	  fi; \

	  LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \

	  export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \

	  export LD_PRELOAD; \

	fi