Changeset: 1b616a20ba7e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b616a20ba7e
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-monetdblite
Log Message:
Make MonetDBLite compatible with older versions of glibc.
Tested successfully on glibc 2.19.
Also test for POSIX regex library presence every time in MonetDBLite build.
diffs (43 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -494,8 +494,8 @@ endif()
if(NOT HAVE_LIBPCRE)
set(PCRE_INCLUDE_DIR "" CACHE INTERNAL "pcre include directory" FORCE)
set(PCRE_LIBRARIES "" CACHE INTERNAL "pcre libraries to link" FORCE)
- check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
endif()
+check_symbol_exists("regcomp" "regex.h" HAVE_POSIX_REGEX)
if(NOT HAVE_LIBPCRE AND NOT HAVE_POSIX_REGEX)
if(${ENABLE_MONETDB5} STREQUAL "YES")
message(FATAL_ERROR "PCRE library or GNU regex library not
found but required for MonetDB5")
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -84,16 +84,20 @@
#include <Windows.h>
#endif /* _MSC_VER */
-#ifdef HAVE_EMBEDDED /* Extensions not available in MonetDBLite */
+#ifdef HAVE_EMBEDDED
#if defined(__GLIBC__) && (defined(__amd64) || defined(__amd64__) ||
defined(__x86_64) || defined(__x86_64__))
-//__asm__(".symver powf,powf@GLIBC_2.2.5"); // Perform this hack for backwards
compatibility
-//__asm__(".symver logf,logf@GLIBC_2.2.5");
-//__asm__(".symver expf,expf@GLIBC_2.2.5");
-//__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
+__asm__(".symver exp,exp@GLIBC_2.2.5"); // Make compatible with old versions
of glibc (tested on glibc 2.19)
+__asm__(".symver expf,expf@GLIBC_2.2.5");
+__asm__(".symver log,log@GLIBC_2.2.5");
+__asm__(".symver logf,logf@GLIBC_2.2.5");
+__asm__(".symver log2,log2@GLIBC_2.2.5");
+__asm__(".symver log2f,log2f@GLIBC_2.2.5");
+__asm__(".symver pow,pow@GLIBC_2.2.5");
+__asm__(".symver powf,powf@GLIBC_2.2.5");
#endif
-#else
+#else /* Extensions not available in MonetDBLite */
/* Define to 1 if you have the `accept4' function. */
#cmakedefine HAVE_ACCEPT4 1
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
