diff options
| -rwxr-xr-x | configure | 68 | ||||
| -rw-r--r-- | configure.ac | 51 | ||||
| -rw-r--r-- | openssl/Makefile.in | 3 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 23 | ||||
| -rw-r--r-- | rpkid/tests/Makefile.in | 19 |
5 files changed, 20 insertions, 144 deletions
@@ -604,9 +604,6 @@ LIBOBJS DJANGO_ADMIN SECRET_KEY WEBUSER -PYWRAP_LIBDIR -PYWRAP_CMD -PYWRAP OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND RPKID_SUBDIRS @@ -682,7 +679,6 @@ enable_option_checking with_system_openssl enable_openssl_asm enable_python -enable_pywrap enable_django ' ac_precious_vars='build_alias @@ -1311,7 +1307,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-openssl-asm Don't let OpenSSL build assembler code --disable-python Don't build any of the Python-based tools - --enable-pywrap Build pywrap --disable-django Don't build Django GUI Optional Packages: @@ -2361,13 +2356,6 @@ else enable_python=auto fi -# Check whether --enable-pywrap was given. -if test "${enable_pywrap+set}" = set; then : - enableval=$enable_pywrap; -else - enable_pywrap=auto -fi - # Check whether --enable-django was given. if test "${enable_django+set}" = set; then : enableval=$enable_django; @@ -4165,7 +4153,6 @@ if test "x$PYTHON" = "x" then have_python=no have_python_h=no - need_pywrap=no have_django=no else have_python=yes @@ -4186,17 +4173,6 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need pywrap" >&5 -$as_echo_n "checking whether we need pywrap... " >&6; } - if ldd $PYTHON 2>&5 | $GREP 'libcrypto' >/dev/null 2>&1 - then - need_pywrap=yes - else - need_pywrap=no - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $need_pywrap" >&5 -$as_echo "$need_pywrap" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Django" >&5 $as_echo_n "checking for Django... " >&6; } if $PYTHON -c 'import django' 2>/dev/null @@ -4231,30 +4207,6 @@ $as_echo "$as_me: WARNING: I can't find your Python binary, disabling build for *) as_fn_error $? "Unrecognized value for --enable-python: $enable_python" "$LINENO" 5;; esac -case $enable_pywrap in - yes) build_pywrap=yes - if test $build_python = no - then - as_fn_error $? "Building pywrap without Python makes no sense" "$LINENO" 5 - fi - if test $build_openssl = no - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pywrap not needed (but I'll try to build it anyway)" >&5 -$as_echo "$as_me: WARNING: pywrap not needed (but I'll try to build it anyway)" >&2;} - fi - ;; - no) build_pywrap=no - if test $need_pywrap = yes - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This platform appears to require pywrap (but I'll try to build without it anyway)" >&5 -$as_echo "$as_me: WARNING: This platform appears to require pywrap (but I'll try to build without it anyway)" >&2;} - fi - ;; - auto) build_pywrap=$need_pywrap - ;; - *) as_fn_error $? "Unrecognized value for --enable-pywrap: $enable_pywrap" "$LINENO" 5;; -esac - case $enable_django in yes) build_django=yes if test $have_django = no @@ -4280,7 +4232,6 @@ fi TOP_LEVEL_SUBDIRS="" test $build_openssl = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" -test $build_pywrap = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid" test $have_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rtr-origin" @@ -4356,24 +4307,6 @@ else LIBS="$LIBS -lssl -lcrypto" fi -# Sort out which interpreter POW-using Python programs should use. - -if test $build_pywrap = yes -then - ac_config_files="$ac_config_files pywrap/Makefile" - - PYWRAP='${libexecdir}/pywrap' - PYWRAP_CMD='LD_LIBRARY_PATH="${abs_top_builddir}/openssl/openssl" ${abs_top_builddir}/pywrap/pywrap' - PYWRAP_LIBDIR='${libdir}/pywrap' -else - PYWRAP="$PYTHON" - PYWRAP_CMD="$PYTHON" - PYWRAP_LIBDIR='' -fi - - - - if test $build_python = yes then ac_config_files="$ac_config_files rpkid/Makefile rpkid/tests/Makefile" @@ -5191,7 +5124,6 @@ do "rcynic/installation-scripts/linux/install.sh") CONFIG_FILES="$CONFIG_FILES rcynic/installation-scripts/linux/install.sh" ;; "openssl/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/Makefile" ;; "openssl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES openssl/tests/Makefile" ;; - "pywrap/Makefile") CONFIG_FILES="$CONFIG_FILES pywrap/Makefile" ;; "rpkid/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/Makefile" ;; "rpkid/tests/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/tests/Makefile" ;; "rpkid/portal-gui/Makefile") CONFIG_FILES="$CONFIG_FILES rpkid/portal-gui/Makefile" ;; diff --git a/configure.ac b/configure.ac index 9cbf4724..39d17017 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,6 @@ fi AC_ARG_WITH([system_openssl], [AS_HELP_STRING([--with-system-openssl], [Link against system copy of OpenSSL])], [], [with_system_openssl=auto]) AC_ARG_ENABLE([openssl_asm], [AS_HELP_STRING([--disable-openssl-asm], [Don't let OpenSSL build assembler code])], [], [enable_openssl_asm=auto]) AC_ARG_ENABLE([python], [AS_HELP_STRING([--disable-python], [Don't build any of the Python-based tools])], [], [enable_python=auto]) -AC_ARG_ENABLE([pywrap], [AS_HELP_STRING([--enable-pywrap], [Build pywrap])], [], [enable_pywrap=auto]) AC_ARG_ENABLE([django], [AS_HELP_STRING([--disable-django], [Don't build Django GUI])], [], [enable_django=auto]) AC_PROG_CC @@ -220,7 +219,6 @@ if test "x$PYTHON" = "x" then have_python=no have_python_h=no - need_pywrap=no have_django=no else have_python=yes @@ -233,15 +231,6 @@ else [have_python_h=yes], [have_python_h=no]) - AC_MSG_CHECKING([whether we need pywrap]) - if ldd $PYTHON 2>&AS_MESSAGE_LOG_FD | $GREP 'libcrypto' >/dev/null 2>&1 - then - need_pywrap=yes - else - need_pywrap=no - fi - AC_MSG_RESULT([$need_pywrap]) - AC_MSG_CHECKING([for Django]) if $PYTHON -c 'import django' 2>/dev/null then @@ -273,28 +262,6 @@ case $enable_python in *) AC_MSG_ERROR([Unrecognized value for --enable-python: $enable_python]);; esac -case $enable_pywrap in - yes) build_pywrap=yes - if test $build_python = no - then - AC_MSG_ERROR([Building pywrap without Python makes no sense]) - fi - if test $build_openssl = no - then - AC_MSG_WARN([pywrap not needed (but I'll try to build it anyway)]) - fi - ;; - no) build_pywrap=no - if test $need_pywrap = yes - then - AC_MSG_WARN([This platform appears to require pywrap (but I'll try to build without it anyway)]) - fi - ;; - auto) build_pywrap=$need_pywrap - ;; - *) AC_MSG_ERROR([Unrecognized value for --enable-pywrap: $enable_pywrap]);; -esac - case $enable_django in yes) build_django=yes if test $have_django = no @@ -319,7 +286,6 @@ fi TOP_LEVEL_SUBDIRS="" test $build_openssl = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl" TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rcynic utils" -test $build_pywrap = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS pywrap" test $build_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rpkid" test $have_python = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rtr-origin" @@ -399,23 +365,6 @@ else LIBS="$LIBS -lssl -lcrypto" fi -# Sort out which interpreter POW-using Python programs should use. - -if test $build_pywrap = yes -then - AC_CONFIG_FILES([pywrap/Makefile]) - PYWRAP='${libexecdir}/pywrap' - PYWRAP_CMD='LD_LIBRARY_PATH="${abs_top_builddir}/openssl/openssl" ${abs_top_builddir}/pywrap/pywrap' - PYWRAP_LIBDIR='${libdir}/pywrap' -else - PYWRAP="$PYTHON" - PYWRAP_CMD="$PYTHON" - PYWRAP_LIBDIR='' -fi -AC_SUBST(PYWRAP) -AC_SUBST(PYWRAP_CMD) -AC_SUBST(PYWRAP_LIBDIR) - if test $build_python = yes then AC_CONFIG_FILES([rpkid/Makefile rpkid/tests/Makefile]) diff --git a/openssl/Makefile.in b/openssl/Makefile.in index 8068475b..cfe0c9aa 100644 --- a/openssl/Makefile.in +++ b/openssl/Makefile.in @@ -5,7 +5,6 @@ VERSION = 1.0.0d OPENSSL_CONFIG_COMMAND = @OPENSSL_CONFIG_COMMAND@ OPENSSL_BUILD_DIRECTORY = ${abs_builddir}/openssl OPENSSL_SO_GLOB = @OPENSSL_SO_GLOB@ -PYWRAP_LIBDIR = @PYWRAP_LIBDIR@ abs_top_srcdir = @abs_top_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -27,7 +26,7 @@ OPTIONS = enable-rfc3779 enable-cms no-dso shared --prefix=${prefix} all: build_libs build_apps build_tests build_tools build_symlink build_libs: openssl-${VERSION}/Makefile - cd openssl-${VERSION}; ${MAKE} build_libs LIBRPATH=${PYWRAP_LIBDIR} + cd openssl-${VERSION}; ${MAKE} build_libs build_apps: openssl-${VERSION}/apps/openssl diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 2a03a670..d9406aae 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -2,8 +2,6 @@ SUBDIRS = @RPKID_SUBDIRS@ PYTHON = @PYTHON@ -PYWRAP = @PYWRAP@ -PYWRAP_CMD = @PYWRAP_CMD@ SECRET_KEY = @SECRET_KEY@ WEBUSER = @WEBUSER@ @@ -104,7 +102,7 @@ relaxng: left-right-schema.rng up-down-schema.rng publication-schema.rng xmllint --noout --relaxng publication-schema.rng tests/publication-protocol-samples/*.xml unit-tests: all - PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD ${PYWRAP_CMD} $$i; done + PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD ${PYTHON} $$i; done all-tests:: unit-tests @@ -180,14 +178,13 @@ distclean:: clean docclean all install clean test distclean deinstall uninstall:: @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done -COMPILE_COMMON = \ +COMPILE_PYTHON = \ + rm -f $@; \ + AC_PYTHON_INTERPRETER='${PYTHON}' \ AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ -COMPILE_PYTHON = rm -f $@; AC_PYTHON_INTERPRETER='${PYTHON}' ${COMPILE_COMMON} -COMPILE_PYWRAP = rm -f $@; AC_PYTHON_INTERPRETER='${PYWRAP}' ${COMPILE_COMMON} - COMPILE_SETTINGS = \ rm -f $@; \ AC_DATABASE_PATH='${DESTDIR}${localstatedir}/rpki/gui.db' \ @@ -208,22 +205,22 @@ rpki-start-servers: rpki-start-servers.py ${COMPILE_PYTHON} irbe_cli: irbe_cli.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} irdbd: irdbd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} myrpki: myrpki.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} pubd: pubd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} rootd: rootd.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} rpkid: rpkid.py - ${COMPILE_PYWRAP} + ${COMPILE_PYTHON} portal-gui/scripts/rpkigui-load-csv: portal-gui/scripts/load_csv.py ${COMPILE_PYTHON} diff --git a/rpkid/tests/Makefile.in b/rpkid/tests/Makefile.in index b7a125e0..f86573da 100644 --- a/rpkid/tests/Makefile.in +++ b/rpkid/tests/Makefile.in @@ -1,7 +1,6 @@ # $Id$ PYTHON = @PYTHON@ -PYWRAP_CMD = @PYWRAP_CMD@ abs_top_builddir = @abs_top_builddir@ all: protocol-samples @@ -29,29 +28,29 @@ parse-test: protocol-samples all-tests:: parse-test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.1.yaml + ${PYTHON} smoketest.py -y smoketest.1.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.2.yaml + ${PYTHON} smoketest.py -y smoketest.2.yaml test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.3.yaml + ${PYTHON} smoketest.py -y smoketest.3.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.4.yaml + ${PYTHON} smoketest.py -y smoketest.4.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.5.yaml + ${PYTHON} smoketest.py -y smoketest.5.yaml test all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.6.yaml + ${PYTHON} smoketest.py -y smoketest.6.yaml all-tests:: - ${PYWRAP_CMD} smoketest.py -y smoketest.7.yaml + ${PYTHON} smoketest.py -y smoketest.7.yaml profile: all find smoketest.dir -name '*.prof' -delete - ${PYWRAP_CMD} smoketest.py -y smoketest.2.yaml -p + ${PYTHON} smoketest.py -y smoketest.2.yaml -p for i in smoketest.dir/*.prof; do ${PYTHON} -c "import pstats;pstats.Stats('$$i').sort_stats('time').print_stats()"; done # This isn't a full exercise of the yamltest framework, but is @@ -62,7 +61,7 @@ YAMLTEST_CONFIG = smoketest.1.yaml yamltest: rm -rf yamltest.dir rcynic-data ${PYTHON} sql-cleaner.py - ${PYWRAP_CMD} yamltest.py ${YAMLTEST_CONFIG} + ${PYTHON} yamltest.py ${YAMLTEST_CONFIG} backup: ${PYTHON} sql-dumper.py |