Browse Source

Merge pull request #14376 from neheb/b

bonnie++: fix compilation with glibc
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
aa6d8f1f19
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      utils/bonnie++/Makefile
  2. +2
    -2
      utils/bonnie++/patches/010-openwrt-fixes.patch

+ 1
- 1
utils/bonnie++/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bonnie++ PKG_NAME:=bonnie++
PKG_VERSION:=1.98 PKG_VERSION:=1.98
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://www.coker.com.au/bonnie++/ PKG_SOURCE_URL:=https://www.coker.com.au/bonnie++/


+ 2
- 2
utils/bonnie++/patches/010-openwrt-fixes.patch View File

@ -18,11 +18,11 @@
bonnie++: $(BONOBJS) bonnie++: $(BONOBJS)
- $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS) - $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS)
+ $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS)
+ $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS) @thread_ldflags@
zcav: $(ZCAVOBJS) zcav: $(ZCAVOBJS)
- $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS) - $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS)
+ $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS)
+ $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS) @thread_ldflags@
getc_putc: $(GETCOBJS) getc_putc_helper getc_putc: $(GETCOBJS) getc_putc_helper
- $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS) - $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)


Loading…
Cancel
Save