mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
CI: New way to determnine libdir
We were using the presence of /usr/lib64 to determine where shared libraries should be installed. This only existed on Redhat based systems and was safe. If it existed, use it, otherwise use /usr/lib. Unfortunately, Ubuntu 19 decided to create a /usr/lib64 BUT NOT INCLUDE IT IN THE DEFAULT ld.so.conf. So if anything is installed there, it won't work. The new method, just looks for $ID in /etc/os-release and if it's centos or fedora, uses /usr/lib64 and if ubuntu, uses /usr/lib. NOTE: This applies only to the CI scripts. Normal asterisk build and install is not affected. Change-Id: Iad66374b550fd89349bedbbf2b93f8edd195a7c3
This commit is contained in:
@@ -89,7 +89,7 @@ runner ulimit -a
|
||||
|
||||
MAKE=`which make`
|
||||
PKGCONFIG=`which pkg-config`
|
||||
[ -d /usr/lib64 ] && _libdir=/usr/lib64
|
||||
_libdir=`${CIDIR}/findLibdir.sh`
|
||||
|
||||
common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
|
||||
$PKGCONFIG 'jansson >= 2.11' || common_config_args+=" --with-jansson-bundled"
|
||||
|
14
tests/CI/findLibdir.sh
Executable file
14
tests/CI/findLibdir.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source /etc/os-release
|
||||
|
||||
case $ID in
|
||||
centos)
|
||||
echo /usr/lib64
|
||||
;;
|
||||
fedora)
|
||||
echo /usr/lib64
|
||||
;;
|
||||
ubuntu)
|
||||
echo /usr/lib
|
||||
esac
|
Reference in New Issue
Block a user