<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11482">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CI:  New way to determnine libdir<br><br>We were using the presence of /usr/lib64 to determine where<br>shared libraries should be installed.  This only existed on<br>Redhat based systems and was safe.  If it existed, use it,<br>otherwise use /usr/lib.<br><br>Unfortunately, Ubuntu 19 decided to create a /usr/lib64 BUT<br>NOT INCLUDE IT IN THE DEFAULT ld.so.conf.  So if anything is<br>installed there, it won't work.<br><br>The new method, just looks for $ID in /etc/os-release and if it's<br>centos or fedora, uses /usr/lib64 and if ubuntu, uses /usr/lib.<br><br>NOTE:  This applies only to the CI scripts.  Normal asterisk<br>build and install is not affected.<br><br>Change-Id: Iad66374b550fd89349bedbbf2b93f8edd195a7c3<br>---<br>M tests/CI/buildAsterisk.sh<br>A tests/CI/findLibdir.sh<br>2 files changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh</span><br><span>index b8c301b..f5980e8 100755</span><br><span>--- a/tests/CI/buildAsterisk.sh</span><br><span>+++ b/tests/CI/buildAsterisk.sh</span><br><span>@@ -89,7 +89,7 @@</span><br><span> </span><br><span> MAKE=`which make`</span><br><span> PKGCONFIG=`which pkg-config`</span><br><span style="color: hsl(0, 100%, 40%);">-[ -d /usr/lib64 ] && _libdir=/usr/lib64</span><br><span style="color: hsl(120, 100%, 40%);">+_libdir=`${CIDIR}/findLibdir.sh`</span><br><span> </span><br><span> common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"</span><br><span> $PKGCONFIG 'jansson' || common_config_args+=" --with-jansson-bundled"</span><br><span>diff --git a/tests/CI/findLibdir.sh b/tests/CI/findLibdir.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..ed25ba3</span><br><span>--- /dev/null</span><br><span>+++ b/tests/CI/findLibdir.sh</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env bash</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+source /etc/os-release</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+case $ID in</span><br><span style="color: hsl(120, 100%, 40%);">+     centos)</span><br><span style="color: hsl(120, 100%, 40%);">+               echo /usr/lib64</span><br><span style="color: hsl(120, 100%, 40%);">+               ;;</span><br><span style="color: hsl(120, 100%, 40%);">+    fedora)</span><br><span style="color: hsl(120, 100%, 40%);">+               echo /usr/lib64</span><br><span style="color: hsl(120, 100%, 40%);">+               ;;</span><br><span style="color: hsl(120, 100%, 40%);">+    ubuntu)</span><br><span style="color: hsl(120, 100%, 40%);">+               echo /usr/lib</span><br><span style="color: hsl(120, 100%, 40%);">+esac</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11482">change 11482</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/+/11482"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: Iad66374b550fd89349bedbbf2b93f8edd195a7c3 </div>
<div style="display:none"> Gerrit-Change-Number: 11482 </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: Corey Farrell <git@cfware.com> </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-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>