p70621953
/
openGauss-server
forked from openGauss-Ecosystem/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!2175 修复postgis编译问题 

Merge pull request !2175 from 仲夏十三/mas
This commit is contained in:
opengauss-bot 2022-09-20 01:50:38 +00:00 committed by Gitee
parent b30defdae2 719cc5a3e2
commit deba6c0140
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/script/aarch64_opengauss_list
View File

@ -1007,6 +1007,7 @@
./include/postgresql/server/knl/knl_guc/knl_instance_attr_resource.h
./include/postgresql/server/knl/knl_guc/knl_session_attr_common.h
./include/postgresql/server/knl/knl_guc/knl_instance_attr_common.h
./include/postgresql/server/access/ustore/knl_uverify.h
./include/postgresql/server/lib/circularqueue.h
./include/postgresql/server/access/double_write_basic.h
./include/postgresql/server/knl/knl_thread.h
@ -1117,6 +1118,8 @@
./include/postgresql/server/commands/trigger.h
./include/postgresql/server/executor/spi.h
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

4
build/script/opengauss_release_list_ubuntu_single
View File

@ -1048,12 +1048,16 @@
./include/postgresql/server/access/ustore/undo/knl_uundotxn.h
./include/postgresql/server/access/ustore/undo/knl_uundozone.h
./include/postgresql/server/access/ustore/undo/knl_uundospace.h
./include/postgresql/server/access/ustore/knl_uverify.h
./include/postgresql/server/communication/commproxy_basic.h
./include/postgresql/server/access/parallel_recovery/page_redo.h
./include/postgresql/server/access/parallel_recovery/spsc_blocking_queue.h
./include/postgresql/server/executor/exec/execdesc.h
./include/postgresql/server/db4ai/matrix.h
./include/postgresql/server/db4ai/scores.h
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

3
build/script/x86_64_opengauss_list
View File

@ -1003,6 +1003,7 @@
./include/postgresql/server/knl/knl_guc/knl_instance_attr_resource.h
./include/postgresql/server/knl/knl_guc/knl_session_attr_common.h
./include/postgresql/server/knl/knl_guc/knl_instance_attr_common.h
./include/postgresql/server/access/ustore/knl_uverify.h
./include/postgresql/server/lib/circularqueue.h
./include/postgresql/server/access/double_write_basic.h
./include/postgresql/server/knl/knl_thread.h
@ -1113,6 +1114,8 @@
./include/postgresql/server/commands/trigger.h
./include/postgresql/server/executor/spi.h
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

3
src/CMakeLists.txt
View File

@ -114,6 +114,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/catalog DESTINATION includ
PATTERN "pg_proc.h_for_llt" EXCLUDE
PATTERN "duplicate_oids" EXCLUDE
)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uverify.h DESTINATION include/postgresql/server/access/ustore)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/client_logic DESTINATION include/postgresql/server)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/nodes DESTINATION include/postgresql/server)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/hotpatch DESTINATION include/postgresql/server)
@ -122,6 +123,8 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/datatype DESTINATION inclu
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/regex DESTINATION include/postgresql/server)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/instruments/list.h DESTINATION include/postgresql/server/instruments)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/instruments/instr_event.h DESTINATION include/postgresql/server/instruments)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/instruments/gs_stack.h DESTINATION include/postgresql/server/instruments)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/instruments/instr_mfchain.h DESTINATION include/postgresql/server/instruments)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/tde_key_management/data_common.h DESTINATION include/postgresql/server/tde_key_management)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/bulkload DESTINATION include/postgresql/server)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/gstrace DESTINATION include/postgresql/server)

4
src/include/Makefile
View File

@ -115,6 +115,7 @@ endif
$(INSTALL_DATA) access/ustore/knl_uredo.h '$(DESTDIR)$(includedir_server)/access/ustore/knl_uredo.h'
$(INSTALL_DATA) access/ustore/knl_uundovec.h '$(DESTDIR)$(includedir_server)/access/ustore/knl_uundovec.h'
$(INSTALL_DATA) access/ustore/knl_uundorecord.h '$(DESTDIR)$(includedir_server)/access/ustore/knl_uundorecord.h'
$(INSTALL_DATA) access/ustore/knl_uverify.h '$(DESTDIR)$(includedir_server)/access/ustore/knl_uverify.h'
$(INSTALL_DATA) access/ustore/undo/knl_uundoxlog.h '$(DESTDIR)$(includedir_server)/access/ustore/undo/knl_uundoxlog.h'
$(INSTALL_DATA) access/ustore/undo/knl_uundotxn.h '$(DESTDIR)$(includedir_server)/access/ustore/undo/knl_uundotxn.h'
$(INSTALL_DATA) access/ustore/undo/knl_uundozone.h '$(DESTDIR)$(includedir_server)/access/ustore/undo/knl_uundozone.h'
@ -125,6 +126,9 @@ endif
$(INSTALL_DATA) executor/exec/execdesc.h '$(DESTDIR)$(includedir_server)/executor/exec/execdesc.h'
$(INSTALL_DATA) db4ai/matrix.h '$(DESTDIR)$(includedir_server)/db4ai/matrix.h'
$(INSTALL_DATA) db4ai/scores.h '$(DESTDIR)$(includedir_server)/db4ai/scores.h'
$(INSTALL_DATA) db4ai/db4ai.h '$(DESTDIR)$(includedir_server)/db4ai/db4ai.h'
$(INSTALL_DATA) instruments/gs_stack.h '$(DESTDIR)$(includedir_server)/instruments/gs_stack.h'
$(INSTALL_DATA) instruments/instr_mfchain.h '$(DESTDIR)$(includedir_server)/instruments/instr_mfchain.h'
# We don't use INSTALL_DATA for performance reasons --- there are a lot of files
cp $(srcdir)/*.h '$(DESTDIR)$(includedir_server)'/ || exit; \
chmod $(INSTALL_DATA_MODE) '$(DESTDIR)$(includedir_server)'/*.h || exit; \