From c1da162e63f8ec7d88042fab0bbb7900b5bf752a Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 15 Aug 2014 12:19:11 -0400 Subject: [PATCH 1/2] build: Fix boost build on some platforms When the libpath doesn't line up with the value from config.sub, we don't find the correct path to boost's libs. This adds a hack to try another path before giving up. --- src/m4/ax_boost_base.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4 index e025a7e1c..3f24d5ddc 100644 --- a/src/m4/ax_boost_base.m4 +++ b/src/m4/ax_boost_base.m4 @@ -112,6 +112,12 @@ if test "x$want_boost" = "xyes"; then ;; esac + dnl some arches may advertise a cpu type that doesn't line up with their + dnl prefix's cpu type. For example, uname may report armv7l while libs are + dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's + dnl value for an extra chance of finding the correct path. + libsubdirs="lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs" + dnl first we check the system location for boost libraries dnl this location ist chosen if boost libraries are installed with the --layout=system option dnl or if you install boost with RPM From 0042a7a1572e628eab6855def39102d583e1bdac Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Fri, 8 Aug 2014 15:19:49 -0400 Subject: [PATCH 2/2] build: fix FDELT_TYPE configure check This probably never worked properly. Confirmed working now with every compiler I throw at it. Rebased-From: 8021cf8 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5e46b4b3a..1438bfd7f 100644 --- a/configure.ac +++ b/configure.ac @@ -325,7 +325,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"],