hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix postgis om compile error

Browse Source
This commit is contained in:
ganyang
2022-09-26 18:57:16 +08:00
parent d6e3566052
commit 5783d8ccbd
5 changed files with 207 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
build/script/aarch64_opengauss_list
View File

@ -1120,6 +1120,63 @@
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./include/postgresql/server/access/ustore/undo/knl_uundotype.h
./include/postgresql/server/access/ustore/undo/knl_uundoapi.h
./include/postgresql/server/access/ustore/knl_uheap.h
./include/postgresql/server/access/ustore/knl_utuple.h
./include/postgresql/server/access/ustore/knl_utype.h
./include/postgresql/server/access/ustore/knl_upage.h
./include/postgresql/server/access/ustore/knl_uredo.h
./include/postgresql/server/access/ustore/knl_uundovec.h
./include/postgresql/server/access/ustore/knl_uundorecord.h
./include/postgresql/server/access/ustore/undo/knl_uundoxlog.h
./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/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/access/multixact.h
./include/postgresql/server/access/xlogutils.h
./include/postgresql/server/executor/functions.h
./include/postgresql/server/storage/lock/waitpolicy.h
./include/postgresql/server/storage/page_compression.h
./include/postgresql/server/storage/smgr/knl_usync.h
./include/postgresql/server/storage/smgr/fd.h
./include/postgresql/server/storage/smgr/smgr.h
./include/postgresql/server/storage/sharedfileset.h
./include/postgresql/server/utils/knl_globalsysdbcache.h
./include/postgresql/server/utils/knl_globaldbstatmanager.h
./include/postgresql/server/utils/knl_globalsyscache_common.h
./include/postgresql/server/utils/knl_globalbucketlist.h
./include/postgresql/server/utils/knl_globalsystabcache.h
./include/postgresql/server/utils/knl_globalsystupcache.h
./include/postgresql/server/utils/knl_globaltabdefcache.h
./include/postgresql/server/utils/knl_globalbasedefcache.h
./include/postgresql/server/utils/knl_globalpartdefcache.h
./include/postgresql/server/utils/knl_globalrelmapcache.h
./include/postgresql/server/utils/knl_localsysdbcache.h
./include/postgresql/server/utils/knl_localsystabcache.h
./include/postgresql/server/utils/knl_localsystupcache.h
./include/postgresql/server/utils/knl_localsyscache_common.h
./include/postgresql/server/utils/knl_localtabdefcache.h
./include/postgresql/server/utils/knl_localbasedefcache.h
./include/postgresql/server/utils/knl_localbucketlist.h
./include/postgresql/server/utils/knl_localpartdefcache.h
./include/postgresql/server/utils/pl_global_package_runtime_cache.h
./include/postgresql/server/catalog/pg_tablespace.h
./include/postgresql/server/catalog/pg_subscription.h
./include/postgresql/server/catalog/pg_replication_origin.h
./include/postgresql/server/postmaster/barrier_creator.h
./include/postgresql/server/postmaster/pagerepair.h
./include/postgresql/server/replication/libpqwalreceiver.h
./include/postgresql/server/replication/worker_internal.h
./include/postgresql/server/replication/origin.h
./include/postgresql/server/parser/scanner.h
./include/postgresql/server/parser/keywords.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

38
build/script/opengauss_release_list_ubuntu_single
View File

@ -1058,6 +1058,44 @@
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./include/postgresql/server/access/multixact.h
./include/postgresql/server/access/xlogutils.h
./include/postgresql/server/executor/functions.h
./include/postgresql/server/storage/lock/waitpolicy.h
./include/postgresql/server/storage/page_compression.h
./include/postgresql/server/storage/smgr/knl_usync.h
./include/postgresql/server/storage/smgr/fd.h
./include/postgresql/server/storage/smgr/smgr.h
./include/postgresql/server/storage/sharedfileset.h
./include/postgresql/server/utils/knl_globalsysdbcache.h
./include/postgresql/server/utils/knl_globaldbstatmanager.h
./include/postgresql/server/utils/knl_globalsyscache_common.h
./include/postgresql/server/utils/knl_globalbucketlist.h
./include/postgresql/server/utils/knl_globalsystabcache.h
./include/postgresql/server/utils/knl_globalsystupcache.h
./include/postgresql/server/utils/knl_globaltabdefcache.h
./include/postgresql/server/utils/knl_globalbasedefcache.h
./include/postgresql/server/utils/knl_globalpartdefcache.h
./include/postgresql/server/utils/knl_globalrelmapcache.h
./include/postgresql/server/utils/knl_localsysdbcache.h
./include/postgresql/server/utils/knl_localsystabcache.h
./include/postgresql/server/utils/knl_localsystupcache.h
./include/postgresql/server/utils/knl_localsyscache_common.h
./include/postgresql/server/utils/knl_localtabdefcache.h
./include/postgresql/server/utils/knl_localbasedefcache.h
./include/postgresql/server/utils/knl_localbucketlist.h
./include/postgresql/server/utils/knl_localpartdefcache.h
./include/postgresql/server/utils/pl_global_package_runtime_cache.h
./include/postgresql/server/catalog/pg_tablespace.h
./include/postgresql/server/catalog/pg_subscription.h
./include/postgresql/server/catalog/pg_replication_origin.h
./include/postgresql/server/postmaster/barrier_creator.h
./include/postgresql/server/postmaster/pagerepair.h
./include/postgresql/server/replication/libpqwalreceiver.h
./include/postgresql/server/replication/worker_internal.h
./include/postgresql/server/replication/origin.h
./include/postgresql/server/parser/scanner.h
./include/postgresql/server/parser/keywords.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

57
build/script/x86_64_opengauss_list
View File

@ -1116,6 +1116,63 @@
./include/postgresql/server/db4ai/db4ai.h
./include/postgresql/server/instruments/gs_stack.h
./include/postgresql/server/instruments/instr_mfchain.h
./include/postgresql/server/access/ustore/undo/knl_uundotype.h
./include/postgresql/server/access/ustore/undo/knl_uundoapi.h
./include/postgresql/server/access/ustore/knl_uheap.h
./include/postgresql/server/access/ustore/knl_utuple.h
./include/postgresql/server/access/ustore/knl_utype.h
./include/postgresql/server/access/ustore/knl_upage.h
./include/postgresql/server/access/ustore/knl_uredo.h
./include/postgresql/server/access/ustore/knl_uundovec.h
./include/postgresql/server/access/ustore/knl_uundorecord.h
./include/postgresql/server/access/ustore/undo/knl_uundoxlog.h
./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/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/access/multixact.h
./include/postgresql/server/access/xlogutils.h
./include/postgresql/server/executor/functions.h
./include/postgresql/server/storage/lock/waitpolicy.h
./include/postgresql/server/storage/page_compression.h
./include/postgresql/server/storage/smgr/knl_usync.h
./include/postgresql/server/storage/smgr/fd.h
./include/postgresql/server/storage/smgr/smgr.h
./include/postgresql/server/storage/sharedfileset.h
./include/postgresql/server/utils/knl_globalsysdbcache.h
./include/postgresql/server/utils/knl_globaldbstatmanager.h
./include/postgresql/server/utils/knl_globalsyscache_common.h
./include/postgresql/server/utils/knl_globalbucketlist.h
./include/postgresql/server/utils/knl_globalsystabcache.h
./include/postgresql/server/utils/knl_globalsystupcache.h
./include/postgresql/server/utils/knl_globaltabdefcache.h
./include/postgresql/server/utils/knl_globalbasedefcache.h
./include/postgresql/server/utils/knl_globalpartdefcache.h
./include/postgresql/server/utils/knl_globalrelmapcache.h
./include/postgresql/server/utils/knl_localsysdbcache.h
./include/postgresql/server/utils/knl_localsystabcache.h
./include/postgresql/server/utils/knl_localsystupcache.h
./include/postgresql/server/utils/knl_localsyscache_common.h
./include/postgresql/server/utils/knl_localtabdefcache.h
./include/postgresql/server/utils/knl_localbasedefcache.h
./include/postgresql/server/utils/knl_localbucketlist.h
./include/postgresql/server/utils/knl_localpartdefcache.h
./include/postgresql/server/utils/pl_global_package_runtime_cache.h
./include/postgresql/server/catalog/pg_tablespace.h
./include/postgresql/server/catalog/pg_subscription.h
./include/postgresql/server/catalog/pg_replication_origin.h
./include/postgresql/server/postmaster/barrier_creator.h
./include/postgresql/server/postmaster/pagerepair.h
./include/postgresql/server/replication/libpqwalreceiver.h
./include/postgresql/server/replication/worker_internal.h
./include/postgresql/server/replication/origin.h
./include/postgresql/server/parser/scanner.h
./include/postgresql/server/parser/keywords.h
./jre/ASSEMBLY_EXCEPTION
./jre/bin/java
./jre/bin/jjs

17
src/CMakeLists.txt
View File

@ -115,6 +115,23 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/catalog DESTINATION includ
PATTERN "duplicate_oids" EXCLUDE
)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uverify.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundotype.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundoapi.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uheap.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_utuple.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_utype.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_upage.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uredo.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uundovec.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/knl_uundorecord.h DESTINATION include/postgresql/server/access/ustore)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundoxlog.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundotxn.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundozone.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/ustore/undo/knl_uundospace.h DESTINATION include/postgresql/server/access/ustore/undo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/communication/commproxy_basic.h DESTINATION include/postgresql/server/communication)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/parallel_recovery/page_redo.h DESTINATION include/postgresql/server/access/parallel_recovery)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/access/parallel_recovery/spsc_blocking_queue.h DESTINATION include/postgresql/server/access/parallel_recovery)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/executor/exec/execdesc.h DESTINATION include/postgresql/server/executor/exec)
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)

38
src/include/Makefile
View File

@ -129,6 +129,44 @@ endif
$(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'
$(INSTALL_DATA) access/multixact.h '$(DESTDIR)$(includedir_server)/access/multixact.h'
$(INSTALL_DATA) access/xlogutils.h '$(DESTDIR)$(includedir_server)/access/xlogutils.h'
$(INSTALL_DATA) executor/functions.h '$(DESTDIR)$(includedir_server)/executor/functions.h'
$(INSTALL_DATA) storage/lock/waitpolicy.h '$(DESTDIR)$(includedir_server)/storage/lock/waitpolicy.h'
$(INSTALL_DATA) storage/page_compression.h '$(DESTDIR)$(includedir_server)/storage/page_compression.h'
$(INSTALL_DATA) storage/smgr/knl_usync.h '$(DESTDIR)$(includedir_server)/storage/smgr/knl_usync.h'
$(INSTALL_DATA) storage/smgr/fd.h '$(DESTDIR)$(includedir_server)/storage/smgr/fd.h'
$(INSTALL_DATA) storage/smgr/smgr.h '$(DESTDIR)$(includedir_server)/storage/smgr/smgr.h'
$(INSTALL_DATA) storage/sharedfileset.h '$(DESTDIR)$(includedir_server)/storage/sharedfileset.h'
$(INSTALL_DATA) utils/knl_globalsysdbcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalsysdbcache.h'
$(INSTALL_DATA) utils/knl_globaldbstatmanager.h '$(DESTDIR)$(includedir_server)/utils/knl_globaldbstatmanager.h'
$(INSTALL_DATA) utils/knl_globalsyscache_common.h '$(DESTDIR)$(includedir_server)/utils/knl_globalsyscache_common.h'
$(INSTALL_DATA) utils/knl_globalbucketlist.h '$(DESTDIR)$(includedir_server)/utils/knl_globalbucketlist.h'
$(INSTALL_DATA) utils/knl_globalsystabcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalsystabcache.h'
$(INSTALL_DATA) utils/knl_globalsystupcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalsystupcache.h'
$(INSTALL_DATA) utils/knl_globaltabdefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globaltabdefcache.h'
$(INSTALL_DATA) utils/knl_globalbasedefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalbasedefcache.h'
$(INSTALL_DATA) utils/knl_globalpartdefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalpartdefcache.h'
$(INSTALL_DATA) utils/knl_globalrelmapcache.h '$(DESTDIR)$(includedir_server)/utils/knl_globalrelmapcache.h'
$(INSTALL_DATA) utils/knl_localsysdbcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localsysdbcache.h'
$(INSTALL_DATA) utils/knl_localsystabcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localsystabcache.h'
$(INSTALL_DATA) utils/knl_localsystupcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localsystupcache.h'
$(INSTALL_DATA) utils/knl_localsyscache_common.h '$(DESTDIR)$(includedir_server)/utils/knl_localsyscache_common.h'
$(INSTALL_DATA) utils/knl_localtabdefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localtabdefcache.h'
$(INSTALL_DATA) utils/knl_localbasedefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localbasedefcache.h'
$(INSTALL_DATA) utils/knl_localbucketlist.h '$(DESTDIR)$(includedir_server)/utils/knl_localbucketlist.h'
$(INSTALL_DATA) utils/knl_localpartdefcache.h '$(DESTDIR)$(includedir_server)/utils/knl_localpartdefcache.h'
$(INSTALL_DATA) utils/pl_global_package_runtime_cache.h '$(DESTDIR)$(includedir_server)/utils/pl_global_package_runtime_cache.h'
$(INSTALL_DATA) catalog/pg_tablespace.h '$(DESTDIR)$(includedir_server)/catalog/pg_tablespace.h'
$(INSTALL_DATA) catalog/pg_subscription.h '$(DESTDIR)$(includedir_server)/catalog/pg_subscription.h'
$(INSTALL_DATA) catalog/pg_replication_origin.h '$(DESTDIR)$(includedir_server)/catalog/pg_replication_origin.h'
$(INSTALL_DATA) postmaster/barrier_creator.h '$(DESTDIR)$(includedir_server)/postmaster/barrier_creator.h'
$(INSTALL_DATA) postmaster/pagerepair.h '$(DESTDIR)$(includedir_server)/postmaster/pagerepair.h'
$(INSTALL_DATA) replication/libpqwalreceiver.h '$(DESTDIR)$(includedir_server)/replication/libpqwalreceiver.h'
$(INSTALL_DATA) replication/worker_internal.h '$(DESTDIR)$(includedir_server)/replication/worker_internal.h'
$(INSTALL_DATA) replication/origin.h '$(DESTDIR)$(includedir_server)/replication/origin.h'
$(INSTALL_DATA) parser/scanner.h '$(DESTDIR)$(includedir_server)/parser/scanner.h'
$(INSTALL_DATA) parser/keywords.h '$(DESTDIR)$(includedir_server)/parser/keywords.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; \