kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CI: New way to determnine libdir" into 13

Browse Source
This commit is contained in:
George Joseph
2019-06-25 09:07:49 -05:00
committed by Gerrit Code Review
parent 44e65b92c1 e4ee209bfe
commit 94e0e26c2a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CI/buildAsterisk.sh
View File

@@ -89,7 +89,7 @@ runner ulimit -a
MAKE=`which make` MAKE=`which make`
PKGCONFIG=`which pkg-config` 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" common_config_args="--prefix=/usr ${_libdir:+--libdir=${_libdir}} --sysconfdir=/etc --with-pjproject-bundled"
$PKGCONFIG 'jansson' || common_config_args+=" --with-jansson-bundled" $PKGCONFIG 'jansson' || common_config_args+=" --with-jansson-bundled"

14
tests/CI/findLibdir.sh Executable file
View 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