MXS-1324: Fix build scripts for Debian-based systems
The avrorouter dependencies weren't correctly built for Debian-based systems. This is due to the different way Debian and RHEL store libraries.
This commit is contained in:
@ -9,7 +9,7 @@ command -v apt-get
|
|||||||
if [ $? == 0 ]
|
if [ $? == 0 ]
|
||||||
then
|
then
|
||||||
# DEB-based distro
|
# DEB-based distro
|
||||||
|
install_libdir=/usr/lib
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
|
|
||||||
sudo apt-get install -y --force-yes dpkg-dev git gcc g++ ncurses-dev bison \
|
sudo apt-get install -y --force-yes dpkg-dev git gcc g++ ncurses-dev bison \
|
||||||
@ -18,6 +18,7 @@ then
|
|||||||
sqlite3 liblua5.1 liblua5.1-dev wget
|
sqlite3 liblua5.1 liblua5.1-dev wget
|
||||||
else
|
else
|
||||||
## RPM-based distro
|
## RPM-based distro
|
||||||
|
install_libdir=/usr/lib64
|
||||||
command -v yum
|
command -v yum
|
||||||
|
|
||||||
if [ $? != 0 ]
|
if [ $? != 0 ]
|
||||||
@ -123,7 +124,7 @@ fi
|
|||||||
|
|
||||||
mkdir -p jansson/build
|
mkdir -p jansson/build
|
||||||
pushd jansson/build
|
pushd jansson/build
|
||||||
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DJANSSON_INSTALL_LIB_DIR=/usr/lib64
|
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DJANSSON_INSTALL_LIB_DIR=$install_libdir
|
||||||
make
|
make
|
||||||
sudo make install
|
sudo make install
|
||||||
popd
|
popd
|
||||||
|
Reference in New Issue
Block a user