From f8d704c8da73344607fe9ba8d06276e6934472b4 Mon Sep 17 00:00:00 2001
From: volcanodragon <linfeilong@huawei.com>
Date: Mon, 20 Jul 2020 11:21:14 +0800
Subject: [PATCH] update to 0.3.112 and fix

---
 ...-libaio-install-to-destdir-slash-usr.patch | 20 -------------------
 0002-libaio-makefile-cflags.patch             | 12 ++++++-----
 0003-destdir.patch                            | 11 ----------
 ...x32.patch => 0003-libaio-fix-for-x32.patch |  0
 libaio.spec                                   |  4 +---
 5 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 0000-libaio-install-to-destdir-slash-usr.patch
 delete mode 100644 0003-destdir.patch
 rename 0004-libaio-fix-for-x32.patch => 0003-libaio-fix-for-x32.patch (100%)

diff --git a/0000-libaio-install-to-destdir-slash-usr.patch b/0000-libaio-install-to-destdir-slash-usr.patch
deleted file mode 100644
index aebc175..0000000
--- a/0000-libaio-install-to-destdir-slash-usr.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up libaio-0.3.111/src/Makefile.orig libaio-0.3.111/src/Makefile
---- libaio-0.3.111/src/Makefile.orig	2018-03-06 17:24:47.000000000 -0500
-+++ libaio-0.3.111/src/Makefile	2018-03-07 10:44:49.148004447 -0500
-@@ -53,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map
- 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
- 
- install: $(all_targets)
--	install -D -m 644 libaio.h $(includedir)/libaio.h
--	install -D -m 644 libaio.a $(libdir)/libaio.a
--	install -D -m 755 $(libname) $(libdir)/$(libname)
--	ln -sf $(libname) $(libdir)/$(soname)
--	ln -sf $(libname) $(libdir)/libaio.so
-+	install -D -m 644 libaio.h $(destdir)$(includedir)/libaio.h
-+	install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a
-+	install -D -m 755 $(libname) $(destdir)$(usrlibdir)/$(libname)
-+	ln -sf $(libname) $(destdir)$(usrlibdir)/$(soname)
-+	ln -sf $(libname) $(destdir)$(usrlibdir)/libaio.so
- 
- $(libaio_objs): libaio.h
- 
diff --git a/0002-libaio-makefile-cflags.patch b/0002-libaio-makefile-cflags.patch
index a0b0aa9..1a4d4a6 100644
--- a/0002-libaio-makefile-cflags.patch
+++ b/0002-libaio-makefile-cflags.patch
@@ -1,11 +1,13 @@
---- libaio-0.3.111_old/src/Makefile	2019-01-26 10:54:53.200000000 +0800
-+++ libaio-0.3.111/src/Makefile	2019-01-26 11:20:44.106000000 +0800
-@@ -3,7 +3,7 @@
+diff --git a/src/Makefile b/src/Makefile
+index 37ae219..3325ec3 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,7 +3,7 @@ includedir=$(prefix)/include
  libdir=$(prefix)/lib
  
  CFLAGS ?= -g -fomit-frame-pointer -O2
--CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
-+CFLAGS += $(RPM_OPT_FLAGS) -nostdlib -nostartfiles -Wall -I. -fPIC
+-CFLAGS += -Wall -I. -fPIC
++CFLAGS += $(RPM_OPT_FLAGS) -Wall -I. -fPIC
  SO_CFLAGS=-shared $(CFLAGS)
  L_CFLAGS=$(CFLAGS)
  LINK_FLAGS=
diff --git a/0003-destdir.patch b/0003-destdir.patch
deleted file mode 100644
index 1f89e29..0000000
--- a/0003-destdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libaio-0.3.111_old/Makefile	2019-02-14 04:09:48.697926020 -0500
-+++ libaio-0.3.111/Makefile	2019-02-14 04:10:10.715926272 -0500
-@@ -14,7 +14,7 @@
- 	@$(MAKE) -C src
- 
- install:
--	@$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
-+	@$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(includedir) libdir=$(libdir)
- 
- check:
- 	@$(MAKE) -C harness check
diff --git a/0004-libaio-fix-for-x32.patch b/0003-libaio-fix-for-x32.patch
similarity index 100%
rename from 0004-libaio-fix-for-x32.patch
rename to 0003-libaio-fix-for-x32.patch
diff --git a/libaio.spec b/libaio.spec
index 18555b9..f81862e 100644
--- a/libaio.spec
+++ b/libaio.spec
@@ -6,13 +6,11 @@ License:        LGPLv2+
 URL:            https://pagure.io/libaio
 Source:         https://releases.pagure.org/libaio/libaio-%{version}.tar.gz
 
-Patch0:         0000-libaio-install-to-destdir-slash-usr.patch
 Patch1:         0001-libaio-arm64-ilp32.patch
 %ifarch aarch64 aarch64_ilp32 x86_64
 Patch2:         0002-libaio-makefile-cflags.patch
 %endif
-Patch3:         0003-destdir.patch
-Patch4:         0004-libaio-fix-for-x32.patch
+Patch3:         0003-libaio-fix-for-x32.patch
 
 BuildRequires:  gcc