!2 Fix rpc.h error.Rpc code moved from glibc to libtirpc

Merge pull request !2 from wang_yue111/master
This commit is contained in:
openeuler-ci-bot 2020-07-15 18:04:31 +08:00 committed by Gitee
commit f123e920af
2 changed files with 49 additions and 2 deletions

View File

@ -0,0 +1,42 @@
From f13f0ffeb2f8901e3efa29072ac7935213ae72a6 Mon Sep 17 00:00:00 2001
Date: Wed, 15 Jul 2020 10:14:33 +0800
Subject: [PATCH] fix rpc.h error.Rpc code moved from glibc to libtirpc
---
src/Makefile | 3 +++
src/bench.h | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 5737228..07004f3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -58,6 +58,9 @@ SAMPLES=lmbench/Results/aix/rs6000 lmbench/Results/hpux/snake \
lmbench/Results/irix/indigo2 lmbench/Results/linux/pentium \
lmbench/Results/osf1/alpha lmbench/Results/solaris/ss20*
+CFLAGS += -I/usr/include/tirpc
+LDFLAGS += -ltirpc
+CPPFLAGS += -I/usr/include/tirpc
COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
INCS = bench.h lib_mem.h lib_tcp.h lib_udp.h stats.h timing.h
diff --git a/src/bench.h b/src/bench.h
index 8166408..69ed17b 100644
--- a/src/bench.h
+++ b/src/bench.h
@@ -35,9 +35,9 @@ typedef unsigned char bool_t;
#include <sys/un.h>
#include <sys/resource.h>
#define PORTMAP
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
#endif
-#include <rpc/types.h>
+#include <tirpc/rpc/types.h>
#include <stdarg.h>
#ifndef HAVE_uint
--
2.23.0

View File

@ -2,7 +2,7 @@
Name: lmbench
Version: 3
Release: 1
Release: 2
Summary: Tools for Performance Analysis
License: GPLv2
URL: http://www.bitmover.com/lmbench/
@ -10,8 +10,9 @@ Source0: http://www.bitmover.com/lmbench/%{name}%{version}.tar.gz
Patch0: lmbench3-fix-llseek-and-remove-bk-in-Makefile.patch
Patch1: lmbench3-add-HOWTO-to-indicate-howto-use-this-package.patch
Patch2: Rpc-code-moved-from-glibc-to-libtirpc.patch
BuildRequires: gcc
BuildRequires: gcc libtirpc-devel
%description
A userspace utility for testing the memory subsystem for faults. It's portable and should compile and work on any 32- or 64-bit Unix-like system. (Yes, even weird, proprietary Unices, and even Mac OS X.) For hardware developers, memtester can be told to test memory starting at a particular physical address as of memtester version 4.1.0.
@ -20,6 +21,7 @@ A userspace utility for testing the memory subsystem for faults. It's portable a
%setup -q -n %{name}%{version}/
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%make_build
@ -56,6 +58,9 @@ install -m 0644 results/Makefile %{buildroot}/opt/%{name}/results
/opt/%{name}/*
%changelog
* Wed Jul 15 2020 wangyue <wangyue92@huawei.com> - 3-2
- Fix rpc.h error.Rpc code moved from glibc to libtirpc.
* Sun Mar 29 2020 Wei Xiong <myeuler@163.com>
- Package init