Update boost version for CentOS (#900)

starwarfan · web-flow · commit 2a2712f98f6e · 2021-02-01T13:27:42.000+08:00
diff --git a/scripts/pack.js b/scripts/pack.js
@@ -440,6 +440,9 @@ function isLibAllowed(libSrc) {
   if (!options['archive'] || options['with-ffmpeg']) {
     whiteList.push('libav');
     whiteList.push('libsw');
+    if (osType.includes('centos')) {
+      whiteList.push('libboost');
+    }
   }
 
   const libName = path.basename(libSrc);
diff --git a/source/agent/analytics/install_deps.sh b/source/agent/analytics/install_deps.sh
@@ -35,11 +35,25 @@ do_update() {
   fi
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   if [[ "$OS" =~ .*centos.* ]]
   then
     echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx wget bzip2 x264 gstreamer1-plugins-ugly -y
+    ${SUDO} yum install log4cxx wget bzip2 x264 gstreamer1-plugins-ugly -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
     echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
diff --git a/source/agent/analytics/videoGstPipeline/binding.pipeline.gyp b/source/agent/analytics/videoGstPipeline/binding.pipeline.gyp
@@ -15,15 +15,9 @@
       '/usr/include/gstreamer-1.0',
       '$(CORE_HOME)/common',
       '$(CORE_HOME)/owt_base',
-      '$(CORE_HOME)/addons/common'
+      '$(CORE_HOME)/addons/common',
+      '$(CORE_HOME)/../../build/libdeps/build/include',
     ],
-    # 'include_dirs': [ '..',
-    #                   '$(CORE_HOME)/common',
-    #                   '$(CORE_HOME)/owt_base',
-    #                   '$(CORE_HOME)/../../third_party/webrtc/src',
-    #                   '$(CORE_HOME)/../../third_party/webrtc/src/third_party/libyuv/include',
-    #                   '$(CORE_HOME)/../../build/libdeps/build/include',
-    # ],
     'libraries': [
       '-lboost_system',
       '-lboost_thread',
@@ -33,8 +27,7 @@
       '-lgstapp-1.0',
       '-lgthread-2.0',
       '-llog4cxx',
-      # '-llog4cxx',
-      # '-L$(CORE_HOME)/../../build/libdeps/build/lib',
+      '-L$(CORE_HOME)/../../build/libdeps/build/lib',
       # '-lusrsctp'
     ],
     # 'INET', 'INET6' flags must be added for usrsctp lib, otherwise the arguments of receive callback would shift
@@ -53,40 +46,6 @@
         'cflags_cc!': ['-fno-exceptions']
       }],
     ]
-  },
-# not build test target
-#  {
-#    'target_name': 'SctpTest',
-#    'type' : 'executable',
-#    'sources': [
-#      '../../../core/owt_base/RawTransport.cpp',
-#      '../../../core/owt_base/SctpTransport.cpp',
-#      '../../../core/owt_base/SctpTransportTest.cpp',
-#    ],
-#    'include_dirs': [
-#      '$(CORE_HOME)/common',
-#      '$(CORE_HOME)/owt_base',
-#      '$(CORE_HOME)/../../third_party/usrsctp/usrsctplib'
-#    ],
-#    'libraries': [
-#      '-lboost_system',
-#      '-lboost_thread',
-#      '-llog4cxx',
-#      '-L$(CORE_HOME)/../../third_party/usrsctp/usrsctplib/.libs', '-lusrsctp',
-#    ],
-#    'conditions': [
-#      [ 'OS=="mac"', {
-#        'xcode_settings': {
-#          'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',        # -fno-exceptions
-#          'MACOSX_DEPLOYMENT_TARGET':  '10.7',       # from MAC OS 10.7
-#          'OTHER_CFLAGS': ['-g -O$(OPTIMIZATION_LEVEL) -stdlib=libc++']
-#        },
-#      }, { # OS!="mac"
-#        'cflags!':    ['-fno-exceptions'],
-#        'cflags_cc':  ['-Wall', '-O$(OPTIMIZATION_LEVEL)', '-g', '-std=c++11', '-DINET', '-DINET6'],
-#        'cflags_cc!': ['-fno-exceptions']
-#      }],
-#    ]
-#  }
+  }
   ]
 }
diff --git a/source/agent/audio/install_deps.sh b/source/agent/audio/install_deps.sh
@@ -36,11 +36,25 @@ do_update() {
   fi
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   if [[ "$OS" =~ .*centos.* ]]
   then
     echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx -y
+    ${SUDO} yum install log4cxx -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
     echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
diff --git a/source/agent/recording/install_deps.sh b/source/agent/recording/install_deps.sh
@@ -35,11 +35,25 @@ do_update() {
   fi
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   if [[ "$OS" =~ .*centos.* ]]
   then
     echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx wget bzip2 -y
+    ${SUDO} yum install log4cxx wget bzip2 -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
     echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
diff --git a/source/agent/sip/install_deps.sh b/source/agent/sip/install_deps.sh
@@ -35,11 +35,25 @@ do_update() {
   fi
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   if [[ "$OS" =~ .*centos.* ]]
   then
     echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx -y
+    ${SUDO} yum install log4cxx -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
     echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
diff --git a/source/agent/streaming/install_deps.sh b/source/agent/streaming/install_deps.sh
@@ -35,11 +35,25 @@ do_update() {
   fi
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   if [[ "$OS" =~ .*centos.* ]]
   then
     echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx wget bzip2 -y
+    ${SUDO} yum install log4cxx wget bzip2 -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
     echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
diff --git a/source/agent/video/install_deps.sh b/source/agent/video/install_deps.sh
@@ -19,6 +19,19 @@ usage() {
   echo
 }
 
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
 install_deps() {
   local OS=$(${this}/detectOS.sh | awk '{print tolower($0)}')
   echo $OS
@@ -38,8 +51,9 @@ install_deps() {
       ${SUDO} rpm -Uvh epel-release-latest-7*.rpm
     fi
     ${SUDO} sed -i 's/https/http/g' /etc/yum.repos.d/epel.repo
-    ${SUDO} yum install boost-system boost-thread log4cxx bzip2 -y
+    ${SUDO} yum install log4cxx bzip2 -y
     ${SUDO} yum install intel-gpu-tools -y
+    install_boost
 
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
diff --git a/source/agent/webrtc/install_deps.sh b/source/agent/webrtc/install_deps.sh
@@ -35,21 +35,35 @@ do_update() {
   fi
 }
 
-install_glib() {
+install_boost() {
+  echo -e "\x1b[32mInstalling boost...\x1b[0m"
+  pushd ${this} >/dev/null
+  wget -c http://iweb.dl.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
+  tar xvf boost_1_65_0.tar.bz2
+  pushd boost_1_65_0 >/dev/null
+  ./bootstrap.sh
+  ./b2 --with-thread --with-system
+  cp stage/lib/libboost_*.so* ${this}/lib
+  popd
+  popd
+}
+
+install_libs() {
   if [[ "$OS" =~ .*centos.* ]]
   then
-    echo -e "\x1b[32mInstalling GLib2.0 via yum install...\x1b[0m"
-    ${SUDO} yum install boost-system boost-thread log4cxx glib2 -y
+    echo -e "\x1b[32mInstalling deps via yum install...\x1b[0m"
+    ${SUDO} yum install log4cxx glib2 -y
+    install_boost
   elif [[ "$OS" =~ .*ubuntu.* ]]
   then
-    echo -e "\x1b[32mInstalling GLib2.0 via apt-get install...\x1b[0m"
+    echo -e "\x1b[32mInstalling deps via apt-get install...\x1b[0m"
     ${SUDO} apt-get install libboost-system-dev libboost-thread-dev liblog4cxx-dev libglib2.0-0 -y
   fi
 }
 
 install_all() {
   ${OWT_UPDATE_DONE} || do_update
-  install_glib
+  install_libs
 }
 
 shopt -s extglob

Original file line number	Diff line number	Diff line change
`@@ -440,6 +440,9 @@ function isLibAllowed(libSrc) {`
`440`	`440`	`if (!options['archive'] \|\| options['with-ffmpeg']) {`
`441`	`441`	`whiteList.push('libav');`
`442`	`442`	`whiteList.push('libsw');`
	`443`	`+ if (osType.includes('centos')) {`
	`444`	`+ whiteList.push('libboost');`
	`445`	`+ }`
`443`	`446`	`}`
`444`	`447`
`445`	`448`	`const libName = path.basename(libSrc);`