Bring in the rest of the corrections for shared libraries from the
main trunk.
This commit is contained in:
6
CHANGES
6
CHANGES
@@ -204,6 +204,12 @@
|
|||||||
The previous value, 12, was not always sufficient for BN_mod_exp().
|
The previous value, 12, was not always sufficient for BN_mod_exp().
|
||||||
[Bodo Moeller]
|
[Bodo Moeller]
|
||||||
|
|
||||||
|
*) Make sure that shared libraries get the internal name engine with
|
||||||
|
the full version number and not just 0. This should mark the
|
||||||
|
shared libraries as not backward compatible. Of course, this should
|
||||||
|
be changed again when we can guarantee backward binary compatibility.
|
||||||
|
[Richard Levitte]
|
||||||
|
|
||||||
*) Fix typo in get_cert_by_subject() in by_dir.c
|
*) Fix typo in get_cert_by_subject() in by_dir.c
|
||||||
[Jean-Marc Desperrier <jean-marc.desperrier@certplus.com>]
|
[Jean-Marc Desperrier <jean-marc.desperrier@certplus.com>]
|
||||||
|
|
||||||
|
|||||||
@@ -262,9 +262,9 @@ my %table=(
|
|||||||
# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with
|
# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with
|
||||||
# the new compiler
|
# the new compiler
|
||||||
# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
|
# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version
|
||||||
"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
|
"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o:::::::::dlfcn:tru64-shared::.so",
|
||||||
"alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
|
"alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:tru64-shared::.so",
|
||||||
"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:true64-shared::.so",
|
"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn:tru64-shared::.so",
|
||||||
"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
||||||
|
|
||||||
#### Alpha Linux with GNU C and Compaq C setups
|
#### Alpha Linux with GNU C and Compaq C setups
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ sub_all:
|
|||||||
fi; \
|
fi; \
|
||||||
done; \
|
done; \
|
||||||
if echo "$(DIRS)" | \
|
if echo "$(DIRS)" | \
|
||||||
grep '\(^\| \)\(crypto\|ssl\)\( \|$$\)' > /dev/null 2>&1 && \
|
egrep '(^| )(crypto|ssl)( |$$)' > /dev/null 2>&1 && \
|
||||||
[ -n "$(SHARED_LIBS)" ]; then \
|
[ -n "$(SHARED_LIBS)" ]; then \
|
||||||
$(MAKE) $(SHARED_LIBS); \
|
$(MAKE) $(SHARED_LIBS); \
|
||||||
fi
|
fi
|
||||||
@@ -254,14 +254,14 @@ do_bsd-gcc-shared: linux-shared
|
|||||||
do_linux-shared:
|
do_linux-shared:
|
||||||
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
||||||
( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
( set -x; ${CC} -shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||||
-Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR} \
|
-Wl,-S,-soname=lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||||
-Wl,--whole-archive lib$$i.a \
|
-Wl,--whole-archive lib$$i.a \
|
||||||
-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
|
-Wl,--no-whole-archive $$libs ${EX_LIBS} -lc ) || exit 1; \
|
||||||
libs="$$libs -l$$i"; \
|
libs="$$libs -l$$i"; \
|
||||||
done
|
done
|
||||||
|
|
||||||
# This assumes that GNU utilities are *not* used
|
# This assumes that GNU utilities are *not* used
|
||||||
do_true64-shared:
|
do_tru64-shared:
|
||||||
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
||||||
( set -x; ${CC} -shared -no_archive -o lib$$i.so \
|
( set -x; ${CC} -shared -no_archive -o lib$$i.so \
|
||||||
-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
|
-set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}" \
|
||||||
@@ -273,7 +273,7 @@ do_true64-shared:
|
|||||||
do_solaris-shared:
|
do_solaris-shared:
|
||||||
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
||||||
( set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
( set -x; ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||||
-h lib$$i.so.${SHLIB_MAJOR} \
|
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||||
-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
|
-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
|
||||||
libs="$$libs -l$$i"; \
|
libs="$$libs -l$$i"; \
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user