Changeset: 98af1da2ca66 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98af1da2ca66
Removed Files:
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Modified Files:
monetdb5/mal/mal_debugger.c
sql/test/BugTracker-2009/Tests/All
Branch: unlock
Log Message:
Merge with default branch.
diffs (truncated from 1225 to 300 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -77,8 +77,8 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
[r'bin\mapi.dll', # r'lib\mapi.pdb',
- r'bin\MonetODBC.dll', # r'lib\MonetODBC.pdb',
- r'bin\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
+ r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb',
+ r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
r'bin\stream.dll', # r'lib\stream.pdb',
vcpkg.format(r'bin\libiconv.dll'),
vcpkg.format(r'bin\bz2.dll'),
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBC
- SHARED)
+ MODULE)
target_sources(MonetODBC
PRIVATE
@@ -114,7 +114,7 @@ target_include_directories(MonetODBC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
target_compile_definitions(MonetODBC
- PRIVATE
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBC
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -7,11 +7,11 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
- drvcfg.c
+ drvcfg.c
drvcfg.h)
target_include_directories(MonetODBCs
@@ -21,8 +21,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
@@ -23,8 +23,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
diff --git a/ctest/cmake/detect-bz2.cmake b/ctest/cmake/detect-bz2.cmake
--- a/ctest/cmake/detect-bz2.cmake
+++ b/ctest/cmake/detect-bz2.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename BZIP2_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_LIBBZ2
diff --git a/ctest/cmake/detect-commoncrypto.cmake
b/ctest/cmake/detect-commoncrypto.cmake
--- a/ctest/cmake/detect-commoncrypto.cmake
+++ b/ctest/cmake/detect-commoncrypto.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename COMMONCRYPTO_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect FALSE
legacyvariable HAVE_COMMONCRYPTO
diff --git a/ctest/cmake/detect-curl.cmake b/ctest/cmake/detect-curl.cmake
--- a/ctest/cmake/detect-curl.cmake
+++ b/ctest/cmake/detect-curl.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename CURL_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_CURL
diff --git a/ctest/cmake/detect-fits.cmake b/ctest/cmake/detect-fits.cmake
--- a/ctest/cmake/detect-fits.cmake
+++ b/ctest/cmake/detect-fits.cmake
@@ -31,19 +31,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename CFITSIO_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_FITS
diff --git a/ctest/cmake/detect-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -27,24 +27,17 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename GDAL_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "32")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
+ elseif(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect FALSE
legacyvariable HAVE_SHP
variablename GDAL_FOUND)
endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_SHP
- variablename GDAL_FOUND)
- endif()
else()
message(ERROR "Linux distro: ${LINUX_DISTRO} not known")
message(ERROR "Linux distro version: ${LINUX_DISTRO_VERSION} not known")
diff --git a/ctest/cmake/detect-geos.cmake b/ctest/cmake/detect-geos.cmake
--- a/ctest/cmake/detect-geos.cmake
+++ b/ctest/cmake/detect-geos.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename GEOS_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_GEOM
diff --git a/ctest/cmake/detect-getaddrinfo.cmake
b/ctest/cmake/detect-getaddrinfo.cmake
--- a/ctest/cmake/detect-getaddrinfo.cmake
+++ b/ctest/cmake/detect-getaddrinfo.cmake
@@ -25,15 +25,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
set(UNDETECT "1")
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
set(DETECT "0")
set(UNDETECT "1")
endif()
diff --git a/ctest/cmake/detect-iconv.cmake b/ctest/cmake/detect-iconv.cmake
--- a/ctest/cmake/detect-iconv.cmake
+++ b/ctest/cmake/detect-iconv.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename Iconv_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "32")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "30")
assert_package_detected(
detect TRUE
legacyvariable HAVE_ICONV
diff --git a/ctest/cmake/detect-libpy3.cmake b/ctest/cmake/detect-libpy3.cmake
--- a/ctest/cmake/detect-libpy3.cmake
+++ b/ctest/cmake/detect-libpy3.cmake
@@ -27,19 +27,7 @@ elseif (${LINUX_DISTRO} STREQUAL "ubuntu
variablename Python3_NumPy_FOUND)
endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
- if(${LINUX_DISTRO_VERSION} STREQUAL "30")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "31")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
