From: Mike Gilbert Date: Mon, 21 Sep 2015 19:13:51 +0000 (-0400) Subject: dev-lang/python: Don't patch configure directly X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0170c84efe6352034e68061c73985a0be1736cc2;p=gentoo.git dev-lang/python: Don't patch configure directly Thanks to Arfrever for the suggestion. Bug: https://bugs.gentoo.org/560948 Package-Manager: portage-2.2.20_p164 --- diff --git a/dev-lang/python/files/python-3.3-libressl.patch b/dev-lang/python/files/python-3.3-libressl.patch index 38119c50dd56..72bd63b5f0a5 100644 --- a/dev-lang/python/files/python-3.3-libressl.patch +++ b/dev-lang/python/files/python-3.3-libressl.patch @@ -111,59 +111,6 @@ index 499e8ba..cb151ba 100644 {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, PySSL_RAND_status_doc}, #endif -diff --git a/configure b/configure -index 6be41f5..5b5a2a0 100755 ---- a/configure -+++ b/configure -@@ -8823,6 +8823,48 @@ _ACEOF - - fi - # Dynamic linking for HP-UX -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5 -+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; } -+if ${ac_cv_lib_crypto_RAND_egd+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcrypto $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char RAND_egd (); -+int -+main () -+{ -+return RAND_egd (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_crypto_RAND_egd=yes -+else -+ ac_cv_lib_crypto_RAND_egd=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5 -+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; } -+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then : -+ -+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h -+ -+fi -+ - - # only check for sem_init if thread support is requested - if test "$with_threads" = "yes" -o -z "$with_threads"; then diff --git a/configure.ac b/configure.ac index 6a64bff..90f315a 100644 --- a/configure.ac