From f46acd4a3a74c57a31226b11186746bce6c98813 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Fri, 29 Jun 2018 14:00:00 +0300 Subject: Adopt Debian's fix-FTBFS-on-GNU-Hurd.patch. - Took the original patch by Ondrej Sury; - Applied a fix for a known problem in the patch: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882062 - Fixed a few other issues --- storage/mroonga/vendor/groonga/config.h.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'storage/mroonga') diff --git a/storage/mroonga/vendor/groonga/config.h.cmake b/storage/mroonga/vendor/groonga/config.h.cmake index bfd0cbdc012..ec67c5eea23 100644 --- a/storage/mroonga/vendor/groonga/config.h.cmake +++ b/storage/mroonga/vendor/groonga/config.h.cmake @@ -107,6 +107,7 @@ #cmakedefine HAVE_SIGNAL_H #cmakedefine HAVE_SYS_MMAN_H #cmakedefine HAVE_SYS_PARAM_H +#cmakedefine HAVE_SYS_POLL_H #cmakedefine HAVE_SYS_RESOURCE_H #cmakedefine HAVE_SYS_SELECT_H #cmakedefine HAVE_SYS_SOCKET_H -- cgit v1.2.1 From 83bf267e0d386c35497f34c6ad7bd802c1c8de6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Fri, 29 Jun 2018 12:09:38 +0300 Subject: Fix Internal Compiler Error GCC-6.3.0 Change the float comparison function to use a negated version when comparing for equality. This actually produces less code when compiling with optimizations (O3) on. --- storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'storage/mroonga') diff --git a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c index 44378cfae25..a3d838c327f 100644 --- a/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c +++ b/storage/mroonga/vendor/groonga/lib/ts/ts_expr_node.c @@ -562,7 +562,7 @@ inline static grn_ts_bool grn_ts_op_not_equal_float(grn_ts_float lhs, grn_ts_float rhs) { /* To suppress warnings, "lhs != rhs" is not used. */ - return (lhs < rhs) || (lhs > rhs); + return !grn_ts_op_equal_float(lhs, rhs); } /* grn_ts_op_not_equal_time() returns lhs != rhs. */ -- cgit v1.2.1