<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/19900">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span></span><br></pre><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, approved
  Friendly Automation: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject_bundled: fix cross-compilation with ssl libs<br><br>Asterisk makefiles auto-detect ssl library availability,<br>then they assume that pjproject makefiles will also autodetect<br>an ssl library at the same time, so they do not pass on the<br>autodetection result to pjproject.<br><br>This normally works, except the pjproject makefiles disables<br>autodetection when cross-compiling.<br><br>Fix by explicitly configuring pjproject to use ssl if we<br>have been told to use it or it was autodetected<br><br>ASTERISK-30424 #close<br><br>Change-Id: I8fe2999ea46710e21d1d55a1bed92769c6ebded9<br>---<br>M configure<br>M third-party/pjproject/configure.m4<br>2 files changed, 32 insertions(+), 2 deletions(-)<br><br></pre>
<pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 70a368e..e155e24 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -10093,12 +10093,16 @@</span><br><span>                         y|ye|yes)</span><br><span>                    # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span>                   # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">-                    PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"</span><br><span style="color: hsl(120, 100%, 40%);">+                      PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"</span><br><span>                  ;;</span><br><span>                   *)</span><br><span>                   PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"</span><br><span>                      ;;</span><br><span>                   esac</span><br><span style="color: hsl(120, 100%, 40%);">+          else</span><br><span style="color: hsl(120, 100%, 40%);">+                  if test $PBX_OPENSSL -eq 1 ; then</span><br><span style="color: hsl(120, 100%, 40%);">+                             PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+                   fi</span><br><span>           fi</span><br><span> </span><br><span>               # Determine if we're doing an out-of-tree build...</span><br><span>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4</span><br><span>index aa3ff0a..b16738c 100644</span><br><span>--- a/third-party/pjproject/configure.m4</span><br><span>+++ b/third-party/pjproject/configure.m4</span><br><span>@@ -74,12 +74,16 @@</span><br><span>                    y|ye|yes)</span><br><span>                    # Not to mention SSL is the default in PJProject and means "autodetect".</span><br><span>                   # In Asterisk, "./configure --with-ssl" means "must be present".</span><br><span style="color: hsl(0, 100%, 40%);">-                    PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS}"</span><br><span style="color: hsl(120, 100%, 40%);">+                      PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"</span><br><span>                  ;;</span><br><span>                   *)</span><br><span>                   PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"</span><br><span>                      ;;</span><br><span>                   esac</span><br><span style="color: hsl(120, 100%, 40%);">+          else</span><br><span style="color: hsl(120, 100%, 40%);">+                  if test $PBX_OPENSSL -eq 1 ; then</span><br><span style="color: hsl(120, 100%, 40%);">+                             PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl"</span><br><span style="color: hsl(120, 100%, 40%);">+                   fi</span><br><span>           fi</span><br><span> </span><br><span>               # Determine if we're doing an out-of-tree build...</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/19900">change 19900</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/19900"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8fe2999ea46710e21d1d55a1bed92769c6ebded9 </div>
<div style="display:none"> Gerrit-Change-Number: 19900 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Nick French <naf@sdf.org> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-CC: Nick French <nickfrench@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>