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

On Solaris64, cc needs the flag -xarch=v9 when linking shared 

libraries.  Make a general change to support shared library
linking flags in general.
Noted by Nick Briggs <briggs@parc.xerox.com>
parent 00b6ab09

Configure

+61 −60

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.org

+20 −10
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT) 
SHARED_SSL=libssl$(SHLIB_EXT)

SHARED_LIBS=

SHARED_LIBS_LINK_EXTS=

SHARED_LDFLAGS=



GENERAL=        Makefile

BASENAME=       openssl
@@ -255,7 +256,8 @@ do_bsd-gcc-shared: do_gnu-shared 
do_linux-shared: do_gnu-shared

do_gnu-shared:

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; ${CC}  -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

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

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

		-Wl,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Wl,--whole-archive lib$$i.a \

		-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
@@ -275,7 +277,8 @@ do_alpha-osf1-shared: 
		$(MAKE) do_gnu-shared; \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( set -x; ${CC}  -shared -o lib$$i.so \

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

			-shared -o lib$$i.so \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

		libs="$$libs -l$$i"; \
@@ -290,7 +293,8 @@ do_tru64-shared: 
		$(MAKE) do_gnu-shared; \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( set -x; ${CC}  -shared -msym -o lib$$i.so \

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

			-shared -msym -o lib$$i.so \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \

		libs="$$libs -l$$i"; \
@@ -305,7 +309,8 @@ do_tru64-shared-rpath: 
		$(MAKE) do_gnu-shared; \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( set -x; ${CC}  -shared -msym -o lib$$i.so \

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

			-shared -msym -o lib$$i.so \

			-rpath  ${INSTALLTOP}/lib \

			-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \

			-all lib$$i.a -none $$libs ${EX_LIBS} -lc ) || exit 1; \
@@ -321,7 +326,8 @@ do_solaris-shared: 
	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

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

		  set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

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

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

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

			-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \

		libs="$$libs -l$$i"; \
@@ -340,7 +346,8 @@ do_svr5-shared: 
		  for obj in `ar t lib$$i.a` ; do \

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

		  done ; \

		  set -x; ${CC}  -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

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

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

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

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

		libs="$$libs -l$$i"; \
@@ -353,7 +360,8 @@ do_irix-shared: 
		$(MAKE) do_gnu-shared; \

	else \

		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

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

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

			-Wl,-soname,lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \

			-all lib$$i.a $$libs ${EX_LIBS} -lc) || exit 1; \

		libs="$$libs -l$$i"; \
@@ -363,7 +371,8 @@ do_irix-shared: 
# This assumes that GNU utilities are *not* used

do_hpux-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; /usr/ccs/bin/ld +vnocompatwarnings \

	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \

		+vnocompatwarnings \

		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		-Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
@@ -373,7 +382,8 @@ do_hpux-shared: 
# This assumes that GNU utilities are *not* used

do_hpux64-shared:

	libs='${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

	( set -x; /usr/ccs/bin/ld -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \

		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \

		+forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \

	libs="$$libs -L. -l$$i"; \
@@ -409,7 +419,7 @@ do_hpux64-shared: 
#  HP/UX-64bit: /usr/ccs/bin/ld

#  AIX:		$(CC)

ALLSYMSFLAG=-bnogc

SHAREDFLAGS=-G -bE:lib$$i.exp -bM:SRE

SHAREDFLAGS=${SHARED_LDFLAGS} -G -bE:lib$$i.exp -bM:SRE

SHAREDCMD=$(CC)

do_aix-shared:

	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \