update to 0.3.112 and fix

This commit is contained in:
volcanodragon 2020-07-20 11:21:14 +08:00
parent 04de86821f
commit f8d704c8da
5 changed files with 8 additions and 39 deletions

View File

@ -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

View File

@ -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=

View File

@ -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

View File

@ -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