Merge pull request #14376 from neheb/b

bonnie++: fix compilation with glibc

diff --git a/utils/bonnie++/Makefile b/utils/bonnie++/Makefile
index e89e0728c6ee67af112481cf72a67b50e2e3d64a..6e6d6dfb6164c49a581590f56d202d003fe0dd77 100644 (file)
--- a/utils/bonnie++/Makefile
+++ b/utils/bonnie++/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bonnie++
 PKG_VERSION:=1.98
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=https://www.coker.com.au/bonnie++/

diff --git a/utils/bonnie++/patches/010-openwrt-fixes.patch b/utils/bonnie++/patches/010-openwrt-fixes.patch
index a26b64adb045a42e5f3a524295f60b1ae68951c3..37a99eba9ad530b937cbbd9067cb933159a37be3 100644 (file)
--- a/utils/bonnie++/patches/010-openwrt-fixes.patch
+++ b/utils/bonnie++/patches/010-openwrt-fixes.patch
@@ -18,11 +18,11 @@
  
  bonnie++: $(BONOBJS)
 -      $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS)
-+      $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS)
++      $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS) @thread_ldflags@
  
  zcav: $(ZCAVOBJS)
 -      $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS)
-+      $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS)
++      $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS) @thread_ldflags@
  
  getc_putc: $(GETCOBJS) getc_putc_helper
 -      $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)