<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9774">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: 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;">pjproject_bundled: Find shared libraries in root --with-ssl=PATH.<br><br>The script configure from Teluu expects shared libraries (.so) in a subfolder<br>called 'lib', when --with-xyz=PATH is specified. However for OpenSSL, the<br>default location is the root of the source folder = PATH. Furthermore, Asterisk<br>supports both, 'lib' and root. For consistency and because Asterisk is using<br>(only) OpenSSL in PJProject, it is enhanced to support both locations, just<br>like Asterisk.<br><br>ASTERISK-27995<br><br>Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f<br>---<br>A third-party/pjproject/patches/0000-configure-ssl-library-path.patch<br>1 file changed, 18 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..0ec0e7a</span><br><span>--- /dev/null</span><br><span>+++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/aconfigure.ac (PJSIP 2.7.2)</span><br><span>++++ b/aconfigure.ac (working copy)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1571 +1571,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+- LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span style="color: hsl(120, 100%, 40%);">++ if test -d $with_ssl/lib; then</span><br><span style="color: hsl(120, 100%, 40%);">++ LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span style="color: hsl(120, 100%, 40%);">++ else</span><br><span style="color: hsl(120, 100%, 40%);">++ LDFLAGS="$LDFLAGS -L$with_ssl"</span><br><span style="color: hsl(120, 100%, 40%);">++ fi</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/aconfigure (PJSIP 2.7.2)</span><br><span>++++ b/aconfigure (working copy)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -7884 +7884,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+- LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span style="color: hsl(120, 100%, 40%);">++ if test -d $with_ssl/lib; then</span><br><span style="color: hsl(120, 100%, 40%);">++ LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span style="color: hsl(120, 100%, 40%);">++ else</span><br><span style="color: hsl(120, 100%, 40%);">++ LDFLAGS="$LDFLAGS -L$with_ssl"</span><br><span style="color: hsl(120, 100%, 40%);">++ fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9774">change 9774</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/9774"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f </div>
<div style="display:none"> Gerrit-Change-Number: 9774 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>