From a96a16d72807b3d7519918450d3b0382927fdc67 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 13 Jan 2018 23:59:07 +0100 Subject: [PATCH] Continue build scripts; Fix build on old distros --- data/linux/build-all.sh | 52 +++++++++++++++++++++++++++++++++ data/linux/build64.sh | 12 ++++---- source/utils/CarlaPipeUtils.cpp | 3 ++ 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/data/linux/build-all.sh b/data/linux/build-all.sh index d95a5eb66..02be3ccc7 100755 --- a/data/linux/build-all.sh +++ b/data/linux/build-all.sh @@ -71,6 +71,7 @@ set -e if [ ! -f /tmp/setup-repo ]; then apt-get update apt-get install python-software-properties wget + add-apt-repository ppa:kxstudio-debian/libs add-apt-repository ppa:kxstudio-debian/toolchain apt-get update touch /tmp/setup-repo @@ -96,6 +97,7 @@ if [ ! -f /tmp/setup-repo-packages ]; then apt-get install build-essential libglib2.0-dev uuid-dev git-core apt-get install autoconf libtool apt-get install bison flex libxml-libxml-perl libxml-parser-perl + apt-get clean rm /usr/lib/libuuid.so touch /tmp/setup-repo-packages fi @@ -105,6 +107,14 @@ if [ ! -d ${CHROOT_CARLA_DIR} ]; then chmod -R 777 ${CHROOT_CARLA_DIR}/data/linux/ fi +cd ${CHROOT_CARLA_DIR} +git checkout . +git pull + +# might be updated by git pull +chmod 777 ${CHROOT_CARLA_DIR}/data/linux/*.sh +chmod 777 ${CHROOT_CARLA_DIR}/data/linux/common.env + EOF } @@ -133,8 +143,19 @@ export LANG=C export LC_ALL=C unset LC_TIME +set -e + ${CHROOT_CARLA_DIR}/data/linux/build-deps.sh +if [ ! -f /tmp/setup-repo-packages-extra4 ]; then + apt-get install --no-install-recommends libasound2-dev libx11-dev + apt-get install --no-install-recommends libgtk2.0-dev libqt4-dev + apt-get install --no-install-recommends pyqt4-dev-tools python3-pyqt4.qtopengl python3-liblo python3-rdflib + touch /tmp/setup-repo-packages-extra4 +fi + +# libgtk-3-dev + EOF } @@ -146,3 +167,34 @@ export ARCH=64 chroot_build_deps # --------------------------------------------------------------------------------------------------------------------- +# build carla + +chroot_build_carla() +{ + +CHROOT_DIR=${TARGETDIR}/chroot${ARCH} +cp build${ARCH}.sh common.env ${CHROOT_DIR}${CHROOT_CARLA_DIR}/data/linux/ + +cat < # ifdef CARLA_OS_LINUX # include +# ifndef F_SETPIPE_SZ +# define F_SETPIPE_SZ 1031 +# endif # endif #endif