Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "CI: New way to determnine libdir"

Browse Source
17.0
George Joseph 6 years ago committed by Gerrit Code Review
parent 619a50b7aa 0ba52ce3cf
commit c3adb60dac
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
tests/CI/buildAsterisk.sh
Unescape 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 >= 2.11' || common_config_args+=" --with-jansson-bundled" $PKGCONFIG 'jansson >= 2.11' || common_config_args+=" --with-jansson-bundled"

14
tests/CI/findLibdir.sh
Unescape 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
Write Preview
Loading…
Cancel
Save