From 7c67eebf6d5de2f2570246df790caeed33be5e99 Mon Sep 17 00:00:00 2001 From: 08ming <754041231@qq.com> Date: Wed, 28 Aug 2024 10:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E7=BC=96=E8=AF=91TSDB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GNUmakefile.in | 2 +- build/script/utils/make_compile.sh | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 2e95bfab4..cc5a7b9b0 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -102,7 +102,7 @@ install: @if test -d contrib/gms_stats; then $(MAKE) -C contrib/gms_stats $@; fi @if test -d contrib/gms_profiler; then $(MAKE) -C contrib/gms_profiler $@; fi @if test -d contrib/gms_output; then $(MAKE) -C contrib/gms_output $@; fi - @if test -d contrib/timescaledb; then export CC=${GCC_PATH}/gcc/bin/gcc; export CXX=${GCC_PATH}/gcc/bin/g++; (cd contrib/timescaledb && ./run_to_build.sh && cd build && $(MAKE) $@); fi + @if test -d contrib/timescaledb; then (./contrib/timescaledb/run_to_build.sh && $(MAKE) -C contrib/timescaledb/build $@); fi +@echo "openGauss installation complete." endif endif diff --git a/build/script/utils/make_compile.sh b/build/script/utils/make_compile.sh index 1b1f906dc..c75514c71 100644 --- a/build/script/utils/make_compile.sh +++ b/build/script/utils/make_compile.sh @@ -240,11 +240,6 @@ function install_gaussdb() fi fi fi - -#tsdb prepare - if [ -d "$CODE_BASE/contrib/timescaledb" ]; then - cp $CODE_BASE/contrib/timescaledb/og-timescaledb1.7.4.sql ${GAUSSHOME}/share/postgresql/extension/timescaledb--1.7.4.sql - fi cd "$ROOT_DIR/contrib/pg_upgrade_support" make clean >> "$LOG_FILE" 2>&1