Commit 9f81f237 authored by Richard Levitte's avatar Richard Levitte
Browse files

Set LD_LIBRARY_PATH when linking, since OpenUnix' ld uses it to create 

a library search path.

Correct typos.
parent 0ae4ad9e

Makefile.org

+4 −5
Original line number Diff line number Diff line
@@ -407,15 +407,13 @@ do_svr3-shared: 
			libs="$(LIBKRB5) $$libs"; \

		fi; \

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  SHARE_FLAG='-G'; \

		  (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAGS='-shared'; \

		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		  done ; \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

			$${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

		libs="-l$$i $$libs"; \
@@ -433,13 +431,14 @@ do_svr5-shared: 
		fi; \

		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \

		  SHARE_FLAG='-G'; \

		  (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAGS='-shared'; \

		  (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \

		  find . -name "*.o" -print > allobjs ; \

		  OBJS= ; export OBJS ; \

		  for obj in `ar t lib$$i.a` ; do \

		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \

		  done ; \

		  set -x; ${CC} ${SHARED_LDFLAGS} \

		  set -x; LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \

			${CC} ${SHARED_LDFLAGS} \

			$${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \

apps/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ $(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi

	-(cd ..; OPENSSL="`pwd`/apps/openssl"; export OPENSSL; \

test/Makefile.ssl

+29 −1
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ $(RSATEST): $(RSATEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -300,6 +301,7 @@ $(BNTEST): $(BNTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -307,6 +309,7 @@ $(ECTEST): $(ECTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(ECTEST) $(CFLAGS) $(ECTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(ECTEST) $(CFLAGS) $(ECTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -314,6 +317,7 @@ $(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -321,6 +325,7 @@ $(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -328,6 +333,7 @@ $(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -335,6 +341,7 @@ $(SHATEST): $(SHATEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -342,6 +349,7 @@ $(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -349,6 +357,7 @@ $(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -356,6 +365,7 @@ $(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -363,6 +373,7 @@ $(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -370,6 +381,7 @@ $(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -377,13 +389,15 @@ $(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

xe	  $(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi



$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)

	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -391,6 +405,7 @@ $(BFTEST): $(BFTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -398,6 +413,7 @@ $(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -405,6 +421,7 @@ $(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -412,6 +429,7 @@ $(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -419,6 +437,7 @@ $(DESTEST): $(DESTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -426,6 +445,7 @@ $(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -433,6 +453,7 @@ $(DHTEST): $(DHTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -440,6 +461,7 @@ $(DSATEST): $(DSATEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -447,6 +469,7 @@ $(METHTEST): $(METHTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -454,6 +477,7 @@ $(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(LIBSSL) $(LIBKRB5) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -461,6 +485,7 @@ $(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -468,6 +493,7 @@ $(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o $(EVPTEST) $(CFLAGS) $(EVPTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o $(EVPTEST) $(CFLAGS) $(EVPTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi
@@ -478,6 +504,7 @@ $(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO) 
#	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

#	  $(CC) -o $(AESTEST) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

#	else \

#	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

#	  $(CC) -o $(AESTEST) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

#	fi
@@ -485,6 +512,7 @@ dummytest: dummytest.o $(DLIBCRYPTO) 
	if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" = "darwin-shared" ] ; then \

	  $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(DLIBCRYPTO) $(EX_LIBS) ; \

	else \

	  LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \

	  $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS) ; \

	fi