From ba6bfc71e6ea28418b50f2e3ab92627bf1507f17 Mon Sep 17 00:00:00 2001
From: Rafael Aquini <aquini@redhat.com>
Date: Fri, 23 Mar 2018 15:29:14 -0400
Subject: [PATCH] Update memkind source file to 1.7.0 upstream

Signed-off-by: Rafael Aquini <aquini@linux.com>
---
 .gitignore   |  9 +--------
 memkind.spec | 43 +++++++++++++------------------------------
 sources      |  3 +--
 3 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5947cba..335ec95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-/jemalloc-8a46c970035ada0154f302418cb436de49606231.tar.gz
-/memkind-35c83cee96432edc0b5b21680535a2f2b77a1801.tar.gz
-/memkind-0.3.0.tar.gz
-/memkind-1.0.0.tar.gz
-/memkind-1.1.0.tar.gz
-/memkind-1.3.0.tar.gz
-/memkind-1.4.0.tar.gz
-/memkind-1.5.0.tar.gz
+*.tar.gz
diff --git a/memkind.spec b/memkind.spec
index 8cee6d5..5426b81 100644
--- a/memkind.spec
+++ b/memkind.spec
@@ -1,9 +1,9 @@
-%global gittag0 v1.5.0
+%global gittag0 v1.7.0
 
 Name: memkind
 Summary: User Extensible Heap Manager
-Version: 1.5.0
-Release: 4%{?checkout}%{?dist}
+Version: 1.7.0
+Release: 1%{?checkout}%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://memkind.github.io/memkind
@@ -59,39 +59,17 @@ alpha release. Feedback on design or implementation is greatly appreciated.
 # To ensure the memkind build step is able to discover the output
 # of the jemalloc build we must create an 'obj' directory, and build
 # from within that directory.
-cd %{_builddir}/%{name}-%{version}/jemalloc/
-echo %{version} > %{_builddir}/%{name}-%{version}/jemalloc/VERSION
-test -f configure || %{__autoconf}
-mkdir %{_builddir}/%{name}-%{version}/jemalloc/obj
-ln -s %{_builddir}/%{name}-%{version}/jemalloc/configure \
-      %{_builddir}/%{name}-%{version}/jemalloc/obj/
-cd %{_builddir}/%{name}-%{version}/jemalloc/obj
-%configure --enable-autogen --with-jemalloc-prefix=jemk_ --enable-memkind \
-           --enable-safe --enable-cc-silence --prefix=%{_prefix} \
-	   --without-export --disable-stats --disable-fill \
-	   --disable-valgrind --disable-experimental\
-           --includedir=%{_includedir} --libdir=%{_libdir} \
-           --bindir=%{_bindir} --docdir=%{_docdir}/%{name} \
-           --mandir=%{_mandir} CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -Wno-error=nonnull-compare"
-
-%{__make} %{?_smp_mflags}
-
-# Build memkind lib and tools
 cd %{_builddir}/%{name}-%{version}
 echo %{version} > %{_builddir}/%{name}-%{version}/VERSION
-touch %{_builddir}/%{name}-%{version}/jemalloc/.git
-test -f configure || ./autogen.sh
-%configure --enable-tls --prefix=%{_prefix} --libdir=%{_libdir} \
-           --includedir=%{_includedir} --sbindir=%{_sbindir} \
-           --mandir=%{_mandir} --docdir=%{_docdir}/%{name} \
-           CFLAGS="$RPM_OPT_FLAGS -std=gnu99 -Wno-error=tautological-compare"
-%{__make} %{?_smp_mflags}
+./build.sh --prefix=%{_prefix} --includedir=%{_includedir} --libdir=%{_libdir} \
+           --bindir=%{_bindir} --docdir=%{_docdir}/%{name} --mandir=%{_mandir} \
+           --sbindir=%{_sbindir}
 
 %install
 cd %{_builddir}/%{name}-%{version}
-make install DESTDIR=%{buildroot} INSTALL='install -p'
+make DESTDIR=%{buildroot} INSTALL='install -p' install
 rm -f %{buildroot}/%{_libdir}/lib%{name}.{l,}a
-rm -f %{buildroot}/%{_libdir}/lib{numakind,autohbw}.*
+rm -f %{buildroot}/%{_libdir}/libautohbw.{l,}a
 rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 
 %post -p /sbin/ldconfig
@@ -101,6 +79,7 @@ rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 %files
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so.*
+%{_libdir}/libautohbw.so.*
 %{_bindir}/%{name}-hbw-nodes
 %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/README
@@ -115,11 +94,15 @@ rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
 %{_includedir}/hbwmalloc.h
 %{_includedir}/hbw_allocator.h
 %{_libdir}/lib%{name}.so
+%{_libdir}/libautohbw.so
 %{_mandir}/man3/hbwmalloc.3.*
 %{_mandir}/man3/hbwallocator.3.*
 %{_mandir}/man3/%{name}*.3.*
 
 %changelog
+* Fri Mar 23 2018 Rafael Aquini <aquini@linux.com> - 1.7.0-1
+- Update memkind source file to 1.7.0 upstream
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index e020e32..1f1af0e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (memkind-1.4.0.tar.gz) = f527f5283e8a12efcf5619cfae37d19b2d5e473373d1e292722f7d03c84ba616837f2291dd4bc16ffd9eb43a08e29a1323839a59b00453364c91d22d6d9a739f
-SHA512 (memkind-1.5.0.tar.gz) = f6397b2942f110d108f5e566e4402a0c3a5f8aea2bf2f226ed4abef539da668294f58884c8341d912a30d51f73b48a6f359e721c56e8c9ed696af584cc6428db
+SHA512 (memkind-1.7.0.tar.gz) = c34cc4646ded3fd68b1912f1ba3b11c834d903595954fcd95582746bf35742fd6150e417717ddd8d3aa531a495ce5d13ae8a36029bd6e99d67560ae2c212e929