Skip to content

Commit

Permalink
fix build bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
LINxiansheng authored and linguanren committed May 27, 2024
1 parent f3c98ee commit 6ca3744
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions rpm/devdeps-cos-c-sdk-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ fi
wget http://mirrors.aliyun.com/oceanbase/OceanBase.repo -P /etc/yum.repos.d/
yum install obdevtools-cmake-3.22.1 -y

cd $ROOT_DIR
# depends on libcurl(suggest 7.32.0 or higher)
wget --no-check-certificate https://curl.se/download/curl-8.1.2.tar.gz -O curl-8.1.2.tar.gz
tar -zxvf curl-8.1.2.tar.gz

# depends on expat
wget --no-check-certificate https://sourceforge.net/projects/expat/files/expat/2.5.0/expat-2.5.0.tar.gz/download -O expat-2.5.0.tar.gz
tar -zxvf expat-2.5.0.tar.gz
wget --no-check-certificate https://sourceforge.net/projects/expat/files/expat/2.6.2/expat-2.6.2.tar.gz/download -O expat-2.6.2.tar.gz
tar -zxvf expat-2.6.2.tar.gz

# depends on apr(suggest 1.5.2 or higher)
wget --no-check-certificate https://dlcdn.apache.org//apr/apr-1.7.4.tar.gz -O apr-1.7.4.tar.gz
Expand All @@ -48,4 +49,4 @@ tar -zxvf mxml-3.3.tar.gz
export PATH=/usr/local/oceanbase/devtools/bin:$PATH

cd $CUR_DIR
bash $CUR_DIR/rpmbuild.sh $PROJECT_DIR $PROJECT_NAME $VERSION $RELEASE
bash $CUR_DIR/rpmbuild.sh $PROJECT_DIR $PROJECT_NAME $VERSION $RELEASE
2 changes: 1 addition & 1 deletion rpm/devdeps-cos-c-sdk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ cd curl-8.1.2
make

#step 2: install expat
cd ../expat-2.5.0
cd ../expat-2.6.2
./configure --prefix=%{_tmp_third}
make

Expand Down
4 changes: 2 additions & 2 deletions rpm/obdevtools-gcc9-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CUR_DIR=$(dirname $(readlink -f "$0"))
ROOT_DIR=$CUR_DIR/../
PROJECT_DIR=${1:-"$CUR_DIR"}
PROJECT_NAME=${2:-"obdevtools-gcc"}
PROJECT_NAME=${2:-"obdevtools-gcc9"}
VERSION=${3:-"9.3.0"}
RELEASE=${4:-"1"}

Expand All @@ -26,4 +26,4 @@ if [[ x"$OS_RELEASE" == x"7" ]]; then
fi

cd $CUR_DIR
bash $CUR_DIR/rpmbuild.sh $PROJECT_DIR $PROJECT_NAME $VERSION $RELEASE
bash $CUR_DIR/rpmbuild.sh $PROJECT_DIR $PROJECT_NAME $VERSION $RELEASE

0 comments on commit 6ca3744

Please sign in to comment.