From 80bf430b0837f63cb4bebab6ae388ca5e3a66860 Mon Sep 17 00:00:00 2001 From: infactum Date: Sun, 7 Jul 2019 21:11:35 +0500 Subject: [PATCH] update pjsip * no more custom pjsip fork needed since upstream got C++17 support in 2.9 --- buildenv/Dockerfile.bionic | 3 ++- buildenv/Dockerfile.centos6 | 3 ++- buildenv/Dockerfile.centos7 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildenv/Dockerfile.bionic b/buildenv/Dockerfile.bionic index 68d5127..b35d38a 100644 --- a/buildenv/Dockerfile.bionic +++ b/buildenv/Dockerfile.bionic @@ -28,8 +28,9 @@ RUN git clone https://github.com/tdlib/td.git \ COPY config_site.h / -RUN git clone https://github.com/Infactum/pjproject.git \ +RUN git clone https://github.com/pjsip/pjproject.git \ && cd pjproject \ + && git reset --hard 2.9 \ && cp /config_site.h pjlib/include/pj \ && ./configure --disable-sound CFLAGS="-O3 -DNDEBUG" \ && make dep && make && make install \ diff --git a/buildenv/Dockerfile.centos6 b/buildenv/Dockerfile.centos6 index 7f29128..6b4b04f 100644 --- a/buildenv/Dockerfile.centos6 +++ b/buildenv/Dockerfile.centos6 @@ -37,8 +37,9 @@ RUN source /opt/rh/devtoolset-7/enable \ COPY config_site.h / RUN source /opt/rh/devtoolset-7/enable \ - && git clone https://github.com/Infactum/pjproject.git \ + && git clone https://github.com/pjsip/pjproject.git \ && cd pjproject \ + && git reset --hard 2.9 \ && cp /config_site.h pjlib/include/pj \ && ./configure --disable-sound CFLAGS="-O3 -DNDEBUG" \ && make dep && make && make install \ diff --git a/buildenv/Dockerfile.centos7 b/buildenv/Dockerfile.centos7 index 79e10e9..b1c1b3a 100644 --- a/buildenv/Dockerfile.centos7 +++ b/buildenv/Dockerfile.centos7 @@ -33,8 +33,9 @@ RUN source /opt/rh/devtoolset-7/enable \ COPY config_site.h / RUN source /opt/rh/devtoolset-7/enable \ - && git clone https://github.com/Infactum/pjproject.git \ + && git clone https://github.com/pjsip/pjproject.git \ && cd pjproject \ + && git reset --hard 2.9 \ && cp /config_site.h pjlib/include/pj \ && ./configure --disable-sound CFLAGS="-O3 -DNDEBUG" \ && make dep && make && make install \