提交 0a8afa67 编写于 作者: D David Sharp 提交者: Bradford D. Boyle

Switch quicklz_compressor extensions from gpaddon to gpcontrib

And configure GPDB with --with-quicklz on RHEL

This commit removes quicklz_compressor from all platforms except
RHEL/Centos. Other platforms will be re-enable in the future.
Co-authored-by: NDavid Sharp <dsharp@pivotal.io>
Co-authored-by: NBen Christel <bchristel@pivotal.io>
上级 6de2a3cf
...@@ -74,15 +74,6 @@ function build_gpdb() { ...@@ -74,15 +74,6 @@ function build_gpdb() {
popd popd
} }
function build_quicklz() {
pushd gpaddon_src/quicklz
# Need to have pg_config available to compile and install quicklz.
source ${GREENPLUM_INSTALL_DIR}/greenplum_path.sh
export PATH=${GREENPLUM_INSTALL_DIR}/bin:$PATH
make install
popd
}
function build_gppkg() { function build_gppkg() {
pushd ${GPDB_SRC_PATH}/gpAux pushd ${GPDB_SRC_PATH}/gpAux
make gppkg BLD_TARGETS="gppkg" INSTLOC="${GREENPLUM_INSTALL_DIR}" GPPKGINSTLOC="${GPDB_ARTIFACTS_DIR}" RELENGTOOLS=/opt/releng/tools make gppkg BLD_TARGETS="gppkg" INSTLOC="${GREENPLUM_INSTALL_DIR}" GPPKGINSTLOC="${GPDB_ARTIFACTS_DIR}" RELENGTOOLS=/opt/releng/tools
...@@ -204,10 +195,6 @@ function _main() { ...@@ -204,10 +195,6 @@ function _main() {
rsync -au gpaddon_src/ ${GPDB_SRC_PATH}/gpAux/${ADDON_DIR} rsync -au gpaddon_src/ ${GPDB_SRC_PATH}/gpAux/${ADDON_DIR}
build_gpdb "${BLD_TARGET_OPTION[@]}" build_gpdb "${BLD_TARGET_OPTION[@]}"
if [ "${TARGET_OS}" != "win32" ] ; then
# Do not build quicklz support for windows
build_quicklz
fi
git_info git_info
build_gppkg build_gppkg
if [ "${TARGET_OS}" != "win32" ] ; then if [ "${TARGET_OS}" != "win32" ] ; then
......
...@@ -162,8 +162,8 @@ APU_CONFIG=--with-apu-config=$(BLD_THIRDPARTY_BIN_DIR)/apu-1-config ...@@ -162,8 +162,8 @@ APU_CONFIG=--with-apu-config=$(BLD_THIRDPARTY_BIN_DIR)/apu-1-config
aix7_ppc_64_CONFIGFLAGS=--disable-gpcloud --without-readline --without-libcurl --disable-orca --disable-pxf --without-zstd $(APR_CONFIG) aix7_ppc_64_CONFIGFLAGS=--disable-gpcloud --without-readline --without-libcurl --disable-orca --disable-pxf --without-zstd $(APR_CONFIG)
win32_CONFIGFLAGS=--with-gssapi --without-libcurl --disable-orca --disable-pxf --disable-gpcloud --without-libbz2 $(APR_CONFIG) win32_CONFIGFLAGS=--with-gssapi --without-libcurl --disable-orca --disable-pxf --disable-gpcloud --without-libbz2 $(APR_CONFIG)
sol10_x86_64_CONFIGFLAGS= --with-libxml $(APR_CONFIG) sol10_x86_64_CONFIGFLAGS= --with-libxml $(APR_CONFIG)
rhel6_x86_64_CONFIGFLAGS=--enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG) rhel6_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
rhel7_x86_64_CONFIGFLAGS=--enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG) rhel7_x86_64_CONFIGFLAGS=--with-quicklz --enable-tap-tests --enable-gpperfmon --with-gssapi --enable-mapreduce --enable-orafce ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
#suse10_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG) #suse10_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
#suse11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG) #suse11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
#sles11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG) #sles11_x86_64_CONFIGFLAGS=--enable-gpperfmon --with-gssapi ${ORCA_CONFIG} --with-libxml $(APR_CONFIG) $(APU_CONFIG)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册