Restore port/dynloader; use CMakeLists.txt from stalkerg/pull/44; resolve HAVE_INT128 macro redefinition warning

Author: SamuelMarks

CMakeLists.txt

@@ -25,7 +25,7 @@ set(POSTGRES_VERSION
   ${POSTGRES_MAJOR_VERSION}.${POSTGRES_MINOR_VERSION}.${POSTGRES_PATCH_VERSION})
 
 set(PG_VERSION "11devel")
-set(PG_VERSION_NUM 100000)
+set(PG_VERSION_NUM 110000)
 set(PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org")
 
  # Offer the user the choice of overriding the installation directories
@@ -286,6 +286,15 @@ if(USE_BONJOUR)
 	endif()
 endif()
 
+option(WITH_SYSTEM_TZDATA "Define to use system tzdata information." OFF)
+if (WITH_SYSTEM_TZDATA)
+	if (EXISTS ${WITH_SYSTEM_TZDATA})
+		add_compile_options(-DSYSTEMTZDIR="${WITH_SYSTEM_TZDATA}")
+	else()
+		message(FATAL_ERROR "tzdata directory \"${WITH_SYSTEM_TZDATA}\" does not exists")
+	endif()
+endif()
+
 option(STRONG_RANDOM "Strong random number source" ON)
 option(STRONG_RANDOM_SOURCE "which random number source to use - openssl, win32, dev" OFF)
 if(STRONG_RANDOM)
@@ -691,6 +700,11 @@ if(OPENSSL_FOUND)
 	set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
 	set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
 	check_function_exists(SSL_get_current_compression HAVE_SSL_GET_CURRENT_COMPRESSION)
+	check_function_exists(BIO_get_data HAVE_BIO_GET_DATA)
+	check_function_exists(BIO_meth_new HAVE_BIO_METH_NEW)
+	message(STATUS "OpenSSL version: ${OPENSSL_VERSION} libs: ${OPENSSL_LIBRARIES} include: ${OPENSSL_INCLUDE_DIR}")
+else()
+	message(STATUS "OpenSSL: off")
 endif(OPENSSL_FOUND)
 
 if(USE_SYSTEMD)

contrib/CMakeLists.txt

@@ -26,7 +26,6 @@ add_subdirectory(auto_explain)
 add_subdirectory(btree_gin)
 add_subdirectory(btree_gist)
 add_subdirectory(bloom)
-add_subdirectory(chkpass)
 add_subdirectory(citext)
 add_subdirectory(cube)
 add_subdirectory(dblink)

contrib/chkpass/CMakeLists.txt

@@ -17,6 +17,7 @@ install(TARGETS ${extension_name}
 		LIBRARY DESTINATION ${LIBDIR})
 install(FILES
 	${extension_name}.control
+	${extension_name}--1.4--1.5.sql
 	${extension_name}--1.4.sql
 	${extension_name}--1.3--1.4.sql
 	${extension_name}--1.2--1.3.sql

contrib/citext/CMakeLists.txt

@@ -26,6 +26,7 @@ install(TARGETS ${extension_name}
 		LIBRARY DESTINATION ${LIBDIR})
 install(FILES
 	${extension_name}.control
+	${extension_name}--1.4--1.5.sql
 	${extension_name}--1.4.sql
 	${extension_name}--1.0--1.1.sql
 	${extension_name}--1.1--1.2.sql

contrib/hstore/CMakeLists.txt

@@ -17,8 +17,8 @@ install(TARGETS ${extension_name}
 		LIBRARY DESTINATION ${LIBDIR})
 install(FILES
 	${extension_name}.control
-	${extension_name}--1.4.sql
 	${extension_name}--1.4--1.5.sql
+	${extension_name}--1.4.sql
 	${extension_name}--1.3--1.4.sql
 	${extension_name}--1.2--1.3.sql
 	${extension_name}--1.1--1.2.sql

contrib/pg_stat_statements/CMakeLists.txt

@@ -21,8 +21,8 @@ install(TARGETS ${extension_name}
 		LIBRARY DESTINATION ${LIBDIR})
 install(FILES
 	${extension_name}.control
-	${extension_name}--1.4.sql
 	${extension_name}--1.4--1.5.sql
+	${extension_name}--1.4.sql
 	${extension_name}--1.3--1.4.sql
 	${extension_name}--1.2--1.3.sql
 	${extension_name}--1.1--1.2.sql

contrib/pgstattuple/CMakeLists.txt

@@ -6,7 +6,6 @@ set(modules_list
 	insert_username
 	moddatetime
 	refint
-	timetravel
 )
 
 foreach(loop_var IN ITEMS ${modules_list})