From 8021cf8dbc0aafa15a481c6d9348771a0d0405ff Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 8 Aug 2014 15:19:49 -0400 Subject: [PATCH 1/2] build: fix FDELT_TYPE configure check This probably never worked properly. Confirmed working now with every compiler I throw at it. --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0b2a429e02..ffd05ae4f8 100644 --- a/configure.ac +++ b/configure.ac @@ -332,7 +332,10 @@ if test x$use_glibc_compat != xno; then #__fdelt_chk's params and return type have changed from long unsigned int to long int. # See which one is present here. AC_MSG_CHECKING(__fdelt_chk type) - AC_TRY_COMPILE([#define __USE_FORTIFY_LEVEL 2 + AC_TRY_COMPILE([#ifdef _FORTIFY_SOURCE + #undef _FORTIFY_SOURCE + #endif + #define _FORTIFY_SOURCE 2 #include extern "C" long unsigned int __fdelt_warn(long unsigned int);],[], [ fdelt_type="long unsigned int"], From 565e56977235974c0dd3acfe2023beb84974297c Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 8 Aug 2014 15:21:50 -0400 Subject: [PATCH 2/2] libc-compat: add new symbol that's now needed --- src/compat/glibcxx_compat.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compat/glibcxx_compat.cpp b/src/compat/glibcxx_compat.cpp index 417166aeda..cbe059735b 100644 --- a/src/compat/glibcxx_compat.cpp +++ b/src/compat/glibcxx_compat.cpp @@ -64,6 +64,8 @@ template istream& istream::_M_extract(unsigned short&); out_of_range::~out_of_range() _GLIBCXX_USE_NOEXCEPT { } +length_error::~length_error() _GLIBCXX_USE_NOEXCEPT { } + // Used with permission. // See: https://github.com/madlib/madlib/commit/c3db418c0d34d6813608f2137fef1012ce03043d