p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade rpclib to fix crash when client exits too fast

This commit is contained in:
nsubiron 2018-10-30 15:07:53 +01:00
parent 107b75c36b
commit 6ec8696bbc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Util/BuildTools/Setup.sh
View File

@ -125,7 +125,7 @@ unset BOOST_BASENAME
# -- Get rpclib and compile it with libc++ and libstdc++ -----------------------
# ==============================================================================
RPCLIB_BASENAME=rpclib-2.2.1
RPCLIB_BASENAME=rpclib-d1146b7
RPCLIB_LIBCXX_INCLUDE=${PWD}/${RPCLIB_BASENAME}-libcxx-install/include
RPCLIB_LIBCXX_LIBPATH=${PWD}/${RPCLIB_BASENAME}-libcxx-install/lib
@ -142,7 +142,10 @@ else
log "Retrieving rpclib."
git clone --depth=1 -b v2.2.1 https://github.com/rpclib/rpclib.git ${RPCLIB_BASENAME}-source
git clone https://github.com/rpclib/rpclib.git ${RPCLIB_BASENAME}-source
pushd ${RPCLIB_BASENAME}-source >/dev/null
git reset --hard d1146b7
popd >/dev/null
log "Building rpclib with libc++."

7
Util/InstallersWin/install_rpclib.bat
View File

@ -33,7 +33,7 @@ if not "%1"=="" (
goto :arg-parse
)
set RPC_VERSION=v2.2.1
set RPC_VERSION=d1146b7
set RPC_SRC=rpclib-src
set RPC_SRC_DIR=%BUILD_DIR%%RPC_SRC%\
set RPC_INSTALL=rpclib-install
@ -47,8 +47,11 @@ if exist "%RPC_INSTALL_DIR%" (
if not exist "%RPC_SRC_DIR%" (
echo %FILE_N% Cloning rpclib - version "%RPC_VERSION%"...
call git clone --depth=1 -b %RPC_VERSION% https://github.com/rpclib/rpclib.git %RPC_SRC_DIR%
call git clone https://github.com/rpclib/rpclib.git %RPC_SRC_DIR%
if %errorlevel% neq 0 goto error_git
pushd %RPC_SRC_DIR%
call git reset --hard d1146b7
popd
) else (
echo %FILE_N% Not cloning rpclib because already exists a folder called "%RPC_SRC%".
)