Fix install prefix of third party inside docker (#39)

* Fix bison datarootdir configuration * Add version * Restore bison datarootdir
vesoft-inc · Mar 3, 2022 · 70b11d0 · 70b11d0
1 parent 9d0c12e
commit 70b11d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/docker/run.sh b/docker/run.sh
@@ -3,6 +3,7 @@
 this_dir=$(dirname $(readlink -f $0))
 build_root=$(pwd)
 package_dir=$build_root/packages
+version=3.0
 
 function atexit() {
     compgen -G $package_dir/vesoft-third-party-*.sh &> /dev/null
@@ -12,7 +13,7 @@ function atexit() {
     fi
 
     cp -v $package_dir/vesoft-third-party-*.sh /data
-    [[ -n $OSS_ENDPOINT ]] && ${this_dir}/oss-upload.sh third-party/2.0 $package_dir/vesoft-third-party-*.sh
+    [[ -n $OSS_ENDPOINT ]] && ${this_dir}/oss-upload.sh third-party/$version $package_dir/vesoft-third-party-*.sh
 }
 
 trap atexit EXIT
@@ -25,21 +26,21 @@ nebula-gears-update
 
 git clone --depth=1 https://github.com/vesoft-inc/nebula-third-party.git
 
-versions=${USE_GCC_VERSIONS:-7.5.0,8.3.0,9.1.0,9.2.0,9.3.0,10.1.0}
-install-gcc --version=$versions
+gcc_versions=${USE_GCC_VERSIONS:-7.5.0,8.3.0,9.1.0,9.2.0,9.3.0,10.1.0}
+install-gcc --version=$gcc_versions
 
 install-cmake
 source /opt/vesoft/toolset/cmake/enable
 
-for v in $(echo $versions | tr ',' ' ')
+for v in $(echo $gcc_versions | tr ',' ' ')
 do
     source /opt/vesoft/toolset/gcc/$v/enable
     rm -rf /opt/vesoft/third-party
-    build_package=1 disable_cxx11_abi=0 nebula-third-party/build.sh /opt/vesoft/third-party
+    build_package=1 disable_cxx11_abi=0 nebula-third-party/build.sh /opt/vesoft/third-party/$version
     if [[ $arch = 'x86_64' ]]
     then
         rm -rf /opt/vesoft/third-party
-        build_package=1 disable_cxx11_abi=1 nebula-third-party/build.sh /opt/vesoft/third-party
+        build_package=1 disable_cxx11_abi=1 nebula-third-party/build.sh /opt/vesoft/third-party/$version
     fi
     source /opt/vesoft/toolset/gcc/$v/disable
 done
diff --git a/project/externals/bison.cmake b/project/externals/bison.cmake
@@ -6,7 +6,7 @@ set(name bison)
 set(source_dir ${CMAKE_CURRENT_BINARY_DIR}/${name}/source)
 ExternalProject_Add(
     ${name}
-    URL http://ftp.gnu.org/gnu/bison//bison-3.7.6.tar.gz
+    URL http://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.gz
     URL_HASH MD5=da2df6cf3ed0a7b33fdc09e829c74b4b
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${name}
     TMP_DIR ${BUILD_INFO_DIR}