<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8625">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Corey Farrell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "BuildSystem: In NetBSD, the Python Programming Language is python-X.Y."<br><br>Something is causing a python2/python3 mismatch on Fedora27.<br><br>PYTHON='/usr/bin/python2'<br>PYTHONDEV_CFLAGS='-I/usr/include/python3.6m '<br>PYTHONDEV_INCLUDE='-I/usr/include/python3.6m '<br>PYTHONDEV_LIB='-lpython3.6m '<br>PYTHONDEV_LIBS='-lpython3.6m '<br><br>This reverts commit 96cbfc0d45d3ed9c4a96791f863f267630f9928a.<br><br>Change-Id: I5c53d091518d0d6767da0e77958ef163d9c8d771<br>---<br>M configure<br>M configure.ac<br>2 files changed, 13 insertions(+), 196 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/configure b/configure<br>index 551d050..62439c7 100755<br>--- a/configure<br>+++ b/configure<br>@@ -6822,10 +6822,8 @@<br> fi<br> <br> <br>-for ac_prog in python2 python2.7<br>-do<br>- # Extract the first word of "$ac_prog", so it can be a program name with args.<br>-set dummy $ac_prog; ac_word=$2<br>+# Extract the first word of "python", so it can be a program name with args.<br>+set dummy python; ac_word=$2<br> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5<br> $as_echo_n "checking for $ac_word... " >&6; }<br> if ${ac_cv_path_PYTHON+:} false; then :<br>@@ -6851,6 +6849,7 @@<br> done<br> IFS=$as_save_IFS<br> <br>+ test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON=":"<br> ;;<br> esac<br> fi<br>@@ -6863,10 +6862,6 @@<br> $as_echo "no" >&6; }<br> fi<br> <br>-<br>- test -n "$PYTHON" && break<br>-done<br>-test -n "$PYTHON" || PYTHON=":"<br> <br> # Extract the first word of "find", so it can be a program name with args.<br> set dummy find; ac_word=$2<br>@@ -26046,12 +26041,12 @@<br> pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"<br> elif test -n "$PKG_CONFIG"; then<br> if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python >= 3\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python >= 3") 2>&5<br>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5<br>+ ($PKG_CONFIG --exists --print-errors "python") 2>&5<br> ac_status=$?<br> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br> test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python >= 3" 2>/dev/null`<br>+ pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python" 2>/dev/null`<br> test "x$?" != "x0" && pkg_failed=yes<br> else<br> pkg_failed=yes<br>@@ -26063,12 +26058,12 @@<br> pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"<br> elif test -n "$PKG_CONFIG"; then<br> if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python >= 3\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python >= 3") 2>&5<br>+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5<br>+ ($PKG_CONFIG --exists --print-errors "python") 2>&5<br> ac_status=$?<br> $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br> test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python >= 3" 2>/dev/null`<br>+ pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python" 2>/dev/null`<br> test "x$?" != "x0" && pkg_failed=yes<br> else<br> pkg_failed=yes<br>@@ -26089,185 +26084,9 @@<br> _pkg_short_errors_supported=no<br> fi<br> if test $_pkg_short_errors_supported = yes; then<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python >= 3" 2>&1`<br>+ PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python" 2>&1`<br> else<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python >= 3" 2>&1`<br>- fi<br>- # Put the nasty error message in config.log where it belongs<br>- echo "$PYTHONDEV_PKG_ERRORS" >&5<br>-<br>-<br>- PBX_PYTHONDEV=0<br>-<br>-<br>-elif test $pkg_failed = untried; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>- PBX_PYTHONDEV=0<br>-<br>-<br>-else<br>- PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS<br>- PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>-<br>- PBX_PYTHONDEV=1<br>- PYTHONDEV_INCLUDE="$PYTHONDEV_CFLAGS"<br>- PYTHONDEV_LIB="$PYTHONDEV_LIBS"<br>-<br>-$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h<br>-<br>-<br>-fi<br>- fi<br>-<br>-<br>- if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then<br>-<br>-pkg_failed=no<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5<br>-$as_echo_n "checking for PYTHONDEV... " >&6; }<br>-<br>-if test -n "$PYTHONDEV_CFLAGS"; then<br>- pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"<br>- elif test -n "$PKG_CONFIG"; then<br>- if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python3\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python3") 2>&5<br>- ac_status=$?<br>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>- test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python3" 2>/dev/null`<br>- test "x$?" != "x0" && pkg_failed=yes<br>-else<br>- pkg_failed=yes<br>-fi<br>- else<br>- pkg_failed=untried<br>-fi<br>-if test -n "$PYTHONDEV_LIBS"; then<br>- pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"<br>- elif test -n "$PKG_CONFIG"; then<br>- if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python3\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python3") 2>&5<br>- ac_status=$?<br>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>- test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python3" 2>/dev/null`<br>- test "x$?" != "x0" && pkg_failed=yes<br>-else<br>- pkg_failed=yes<br>-fi<br>- else<br>- pkg_failed=untried<br>-fi<br>-<br>-<br>-<br>-if test $pkg_failed = yes; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then<br>- _pkg_short_errors_supported=yes<br>-else<br>- _pkg_short_errors_supported=no<br>-fi<br>- if test $_pkg_short_errors_supported = yes; then<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python3" 2>&1`<br>- else<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python3" 2>&1`<br>- fi<br>- # Put the nasty error message in config.log where it belongs<br>- echo "$PYTHONDEV_PKG_ERRORS" >&5<br>-<br>-<br>- PBX_PYTHONDEV=0<br>-<br>-<br>-elif test $pkg_failed = untried; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>- PBX_PYTHONDEV=0<br>-<br>-<br>-else<br>- PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS<br>- PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5<br>-$as_echo "yes" >&6; }<br>-<br>- PBX_PYTHONDEV=1<br>- PYTHONDEV_INCLUDE="$PYTHONDEV_CFLAGS"<br>- PYTHONDEV_LIB="$PYTHONDEV_LIBS"<br>-<br>-$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h<br>-<br>-<br>-fi<br>- fi<br>-<br>-<br>- if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then<br>-<br>-pkg_failed=no<br>-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5<br>-$as_echo_n "checking for PYTHONDEV... " >&6; }<br>-<br>-if test -n "$PYTHONDEV_CFLAGS"; then<br>- pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"<br>- elif test -n "$PKG_CONFIG"; then<br>- if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.6\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python-3.6") 2>&5<br>- ac_status=$?<br>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>- test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-3.6" 2>/dev/null`<br>- test "x$?" != "x0" && pkg_failed=yes<br>-else<br>- pkg_failed=yes<br>-fi<br>- else<br>- pkg_failed=untried<br>-fi<br>-if test -n "$PYTHONDEV_LIBS"; then<br>- pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"<br>- elif test -n "$PKG_CONFIG"; then<br>- if test -n "$PKG_CONFIG" && \<br>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.6\""; } >&5<br>- ($PKG_CONFIG --exists --print-errors "python-3.6") 2>&5<br>- ac_status=$?<br>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5<br>- test $ac_status = 0; }; then<br>- pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-3.6" 2>/dev/null`<br>- test "x$?" != "x0" && pkg_failed=yes<br>-else<br>- pkg_failed=yes<br>-fi<br>- else<br>- pkg_failed=untried<br>-fi<br>-<br>-<br>-<br>-if test $pkg_failed = yes; then<br>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5<br>-$as_echo "no" >&6; }<br>-<br>-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then<br>- _pkg_short_errors_supported=yes<br>-else<br>- _pkg_short_errors_supported=no<br>-fi<br>- if test $_pkg_short_errors_supported = yes; then<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-3.6" 2>&1`<br>- else<br>- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-3.6" 2>&1`<br>+ PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python" 2>&1`<br> fi<br> # Put the nasty error message in config.log where it belongs<br> echo "$PYTHONDEV_PKG_ERRORS" >&5<br>diff --git a/configure.ac b/configure.ac<br>index 2384a38..6ec90f6 100644<br>--- a/configure.ac<br>+++ b/configure.ac<br>@@ -261,7 +261,7 @@<br> AC_PATH_PROG([CUT], [cut], :)<br> AC_PATH_PROG([FLEX], [flex], :)<br> AC_PATH_PROG([GREP], [grep], :)<br>-AC_PATH_PROGS([PYTHON], [python2 python2.7], :)<br>+AC_PATH_PROG([PYTHON], [python], :)<br> AC_PATH_PROG([FIND], [find], :)<br> AC_PATH_PROG([COMPRESS], [compress], :)<br> AC_PATH_PROG([BASENAME], [basename], :)<br>@@ -2295,9 +2295,7 @@<br> <br> AC_SUBST([PYTHONDEV_LIB])<br> AC_SUBST([PYTHONDEV_INCLUDE])<br>-AST_PKG_CONFIG_CHECK([PYTHONDEV], [python >= 3])<br>-AST_PKG_CONFIG_CHECK([PYTHONDEV], [python3])<br>-AST_PKG_CONFIG_CHECK([PYTHONDEV], [python-3.6])<br>+AST_PKG_CONFIG_CHECK([PYTHONDEV], [python])<br> <br> AST_EXT_LIB_CHECK([POPT], [popt], [poptStrerror], [popt.h])<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8625">change 8625</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8625"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5c53d091518d0d6767da0e77958ef163d9c8d771 </div>
<div style="display:none"> Gerrit-Change-Number: 8625 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>