diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | openssl/Makefile.in | 16 |
3 files changed, 7 insertions, 16 deletions
@@ -602,7 +602,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS OPENSSL_SHARED_LIBRARY_DIR -OPENSSL_SHARED_LIBRARIES PYWRAP_CMD PYWRAP OPENSSL_CONFIG_COMMAND @@ -4135,12 +4134,10 @@ then ac_config_files="$ac_config_files pywrap/Makefile" OPENSSL_SHARED_LIBRARY_DIR='${libdir}/rpki' - OPENSSL_SHARED_LIBRARIES='enable-shared' PYWRAP='${libexecdir}/pywrap' PYWRAP_CMD='LD_LIBRARY_PATH="${abs_top_builddir}/openssl/openssl" ${abs_top_builddir}/pywrap/pywrap' else OPENSSL_SHARED_LIBRARY_DIR='' - OPENSSL_SHARED_LIBRARIES='disable-shared' PYWRAP="$PYTHON" PYWRAP_CMD="$PYTHON" fi @@ -4148,7 +4145,6 @@ fi - if test $build_python = yes then ac_config_files="$ac_config_files pow/Makefile rpkid/Makefile rpkid/tests/Makefile" diff --git a/configure.ac b/configure.ac index 4778bbf4..bdc7c564 100644 --- a/configure.ac +++ b/configure.ac @@ -269,18 +269,15 @@ if test $build_pywrap = yes then AC_CONFIG_FILES([pywrap/Makefile]) OPENSSL_SHARED_LIBRARY_DIR='${libdir}/rpki' - OPENSSL_SHARED_LIBRARIES='enable-shared' PYWRAP='${libexecdir}/pywrap' PYWRAP_CMD='LD_LIBRARY_PATH="${abs_top_builddir}/openssl/openssl" ${abs_top_builddir}/pywrap/pywrap' else OPENSSL_SHARED_LIBRARY_DIR='' - OPENSSL_SHARED_LIBRARIES='disable-shared' PYWRAP="$PYTHON" PYWRAP_CMD="$PYTHON" fi AC_SUBST(PYWRAP) AC_SUBST(PYWRAP_CMD) -AC_SUBST(OPENSSL_SHARED_LIBRARIES) AC_SUBST(OPENSSL_SHARED_LIBRARY_DIR) if test $build_python = yes diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 659c88c8..9c0a0f06 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -4,7 +4,7 @@ VERSION = 1.0.0b OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ OPENSSL_BUILD_DIRECTORY = @abs_builddir@/openssl -OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@ +OPENSSL_SHARED_LIBRARY_DIR = @OPENSSL_SHARED_LIBRARY_DIR@ # Kludge alert: # @@ -13,15 +13,13 @@ OPENSSL_SHARED_LIBRARIES = @OPENSSL_SHARED_LIBRARIES@ # run out of the build tree. This is temporary. Once we write "make # install" code, we'll have to change that to point to the directory # where the OpenSSL shared libraries will be installed. -# -# I would have avoided shared libraries entirely if I could, but the -# GNU linker isn't able to build POW (see ../pow/) from static -# libraries on 64-bit hardware. -# -# "You are lost in a maze of twisty programs, all broken in different -# ways" -OPTIONS = enable-rfc3779 enable-cms no-dso ${OPENSSL_SHARED_LIBRARIES} --prefix=${OPENSSL_BUILD_DIRECTORY} +# We need to build with enable-shared whether we're really trying to +# build shared OpenSSL libraries or not, because _POW.so requires +# position independent code, so we need OpenSSL compiled with the +# options it would use for a shared library. + +OPTIONS = enable-rfc3779 enable-cms no-dso enable-shared --prefix=${OPENSSL_BUILD_DIRECTORY} all: openssl-${VERSION}/Makefile cd openssl-${VERSION}; ${MAKE} $@ LIBRPATH=${OPENSSL_BUILD_DIRECTORY} |