From e613acffad65b312a75216a47898b76c19e1fd3c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 30 Aug 2019 11:19:24 -0700 Subject: [PATCH] measurement-kit: Fix compilation with uClibc-ng nextafter is not included in std with uClibc-ng. Don't use the std version Signed-off-by: Rosen Penev --- libs/measurement-kit/Makefile | 11 +++++------ libs/measurement-kit/patches/010-nextafter.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 libs/measurement-kit/patches/010-nextafter.patch diff --git a/libs/measurement-kit/Makefile b/libs/measurement-kit/Makefile index be53c6f8c..aa69f78ec 100644 --- a/libs/measurement-kit/Makefile +++ b/libs/measurement-kit/Makefile @@ -9,20 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=measurement-kit PKG_VERSION:=0.10.5 -PKG_RELEASE=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/measurement-kit/measurement-kit/tar.gz/v$(PKG_VERSION)? PKG_HASH:=8b83f04f4d3c653f93bcee5a6cc5e32e6595a3feb99526017d78099fd90d4a75 -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 - +PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jan Pavlinec +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/libs/measurement-kit/patches/010-nextafter.patch b/libs/measurement-kit/patches/010-nextafter.patch new file mode 100644 index 000000000..b7004a6e6 --- /dev/null +++ b/libs/measurement-kit/patches/010-nextafter.patch @@ -0,0 +1,14 @@ +--- a/include/private/catch.hpp ++++ b/include/private/catch.hpp +@@ -11095,7 +11095,11 @@ bool almostEqualUlps(FP lhs, FP rhs, int maxUlpDiff) { + template + FP step(FP start, FP direction, int steps) { + for (int i = 0; i < steps; ++i) { ++#ifndef __UCLIBC__ + start = std::nextafter(start, direction); ++#else ++ start = ::nextafterf(start, direction); ++#endif + } + return start; + }