generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some find it confusing that environment variables are set when shared

Browse Source 
libraries aren't built or used.  I can see the point, so I'm
reorganising a little for clarity.
This commit is contained in:
Richard Levitte 2004-11-11 18:18:43 +00:00
parent 10c8505734
commit 69c922f5d2
3 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile.org
View File

@ -403,18 +403,20 @@ dclean:
rehash: rehash.time rehash: rehash.time
rehash.time: certs rehash.time: certs
@(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \ @(OPENSSL="`pwd`/apps/openssl$(EXE_EXT)"; OPENSSL_DEBUG_MEMORY=on; \
export OPENSSL OPENSSL_DEBUG_MEMORY; \ export OPENSSL OPENSSL_DEBUG_MEMORY; \
LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ if [ -n "$(SHARED_LIBS)" ]; then \
DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
LIBPATH="`pwd`:$$LIBPATH"; \ SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ LIBPATH="`pwd`:$$LIBPATH"; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ if [ "$(PLATFORM)" = "Cygwin" ]; then \
if [ -n "$(SHARED_LIBS)" ]; then \ PATH="`pwd`:$$PATH"; \
LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ fi; \
export LD_PRELOAD; \ LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
fi; \ export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
$(PERL) tools/c_rehash certs) export LD_PRELOAD; \
fi; \
$(PERL) tools/c_rehash certs)
touch rehash.time touch rehash.time
test: tests test: tests
@ -422,14 +424,14 @@ test: tests
tests: rehash tests: rehash
@(cd test && echo "testing..." && \ @(cd test && echo "testing..." && \
$(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests ); $(MAKE) $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
@LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ @if [ -n "$(SHARED_LIBS)" ]; then \
DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
LIBPATH="`pwd`:$$LIBPATH"; \ SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ LIBPATH="`pwd`:$$LIBPATH"; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
if [ -n "$(SHARED_LIBS)" ]; then \
LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
export LD_PRELOAD; \ export LD_PRELOAD; \
fi; \ fi; \
apps/openssl version -a apps/openssl version -a

27
apps/Makefile.ssl
View File

@ -169,18 +169,21 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
LIBRPATH=$(INSTALLTOP)/lib \ LIBRPATH=$(INSTALLTOP)/lib \
link_app.$${shlib_target} link_app.$${shlib_target}
-(cd ..; OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \ -(cd ..;
LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \ if [ -n "$(SHARED_LIBS)" ]; then \
DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \ OPENSSL="`pwd`/apps/$(EXE)"; export OPENSSL; \
SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \ LD_LIBRARY_PATH="`pwd`:$$LD_LIBRARY_PATH"; \
LIBPATH="`pwd`:$$LIBPATH"; \ DYLD_LIBRARY_PATH="`pwd`:$$DYLD_LIBRARY_PATH"; \
if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \ SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ LIBPATH="`pwd`:$$LIBPATH"; \
if [ -n "$(SHARED_LIBS)" ]; then \ if [ "$(PLATFORM)" = "Cygwin" ]; then \
LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ PATH="`pwd`:$$PATH"; \
export LD_PRELOAD; \ fi; \
fi; \ LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
$(PERL) tools/c_rehash certs) export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
export LD_PRELOAD; \
fi; \
$(PERL) tools/c_rehash certs)
progs.h: progs.pl progs.h: progs.pl
$(PERL) progs.pl $(E_EXE) >progs.h $(PERL) progs.pl $(E_EXE) >progs.h

25
test/Makefile.ssl
View File

@ -131,17 +131,20 @@ tests: exe apps $(TESTS)
apps: apps:
@(cd ..; $(MAKE) DIRS=apps all) @(cd ..; $(MAKE) DIRS=apps all)
SET_SO_PATHS=OSSL_LIBPATH="`cd ..; pwd`"; \ SET_SO_PATHS=\
LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \ if [ -n "$(SHARED_LIBS)" ]; then \
DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \ OSSL_LIBPATH="`cd ..; pwd`"; \
SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \ LD_LIBRARY_PATH="$$OSSL_LIBPATH:$$LD_LIBRARY_PATH"; \
LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \ DYLD_LIBRARY_PATH="$$OSSL_LIBPATH:$$DYLD_LIBRARY_PATH"; \
if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="$${LIBPATH}:$$PATH"; fi; \ SHLIB_PATH="$$OSSL_LIBPATH:$$SHLIB_PATH"; \
export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \ LIBPATH="$$OSSL_LIBPATH:$$LIBPATH"; \
if [ -n "$(SHARED_LIBS)" ]; then \ if [ "$(PLATFORM)" = "Cygwin" ]; then \
LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \ PATH="$${LIBPATH}:$$PATH"; \
export LD_PRELOAD; \ fi; \
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
alltests: \ alltests: \
test_des test_idea test_sha test_md4 test_md5 test_hmac \ test_des test_idea test_sha test_md4 test_md5 test_hmac \