From df853b2d202d6bb1ecbfce8b7c72513db3b5a36c Mon Sep 17 00:00:00 2001
From: Jan Pavlinec <jan.pavlinec@nic.cz>
Date: Fri, 29 Nov 2019 11:48:01 +0100
Subject: [PATCH] measurement-kit: update package

Changes:
-add InstallDev section
-remove uclibc patch (issue fixed in upstream)

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
---
 libs/measurement-kit/Makefile                    |  9 ++++++++-
 libs/measurement-kit/patches/010-nextafter.patch | 14 --------------
 2 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 libs/measurement-kit/patches/010-nextafter.patch

diff --git a/libs/measurement-kit/Makefile b/libs/measurement-kit/Makefile
index d7523d48e..c074dcb13 100644
--- a/libs/measurement-kit/Makefile
+++ b/libs/measurement-kit/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=measurement-kit
 PKG_VERSION:=0.10.6
-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)?
@@ -44,6 +44,13 @@ define Build/Configure
 	$(call Build/Configure/Default)
 endef
 
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
 define Package/measurement-kit/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/measurement_kit $(1)/usr/bin/
diff --git a/libs/measurement-kit/patches/010-nextafter.patch b/libs/measurement-kit/patches/010-nextafter.patch
deleted file mode 100644
index b7004a6e6..000000000
--- a/libs/measurement-kit/patches/010-nextafter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/include/private/catch.hpp
-+++ b/include/private/catch.hpp
-@@ -11095,7 +11095,11 @@ bool almostEqualUlps(FP lhs, FP rhs, int maxUlpDiff) {
- template <typename FP>
- 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;
- }