update to 0.3.112 and fix 4

This commit is contained in:
volcanodragon 2020-07-20 11:57:33 +08:00
parent d5398ff1ea
commit 6889ac2753
2 changed files with 24 additions and 5 deletions

View File

@ -0,0 +1,22 @@
diff --git a/src/Makefile b/src/Makefile
index 3325ec3..f0ee30d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -58,12 +58,12 @@ $(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 644 libaio.h $(destdir)$(includedir)/libaio.h
+ install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a
ifeq ($(ENABLE_SHARED),1)
- install -D -m 755 $(libname) $(libdir)/$(libname)
- ln -sf $(libname) $(libdir)/$(soname)
- ln -sf $(libname) $(libdir)/libaio.so
+ install -D -m 755 $(libname) $(destdir)$(usrlibdir)/$(libname)
+ ln -sf $(libname) $(destdir)$(usrlibdir)/$(soname)
+ ln -sf $(libname) $(destdir)$(usrlibdir)/libaio.so
endif
$(libaio_objs): libaio.h

View File

@ -6,6 +6,7 @@ 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
@ -31,15 +32,11 @@ Files for libaio development
%prep
%setup -q -a 0
#%patch0 -p0 -b .install-to-destdir-slash-usr
#%patch0 -p1 -b .install-to-destdir-slash-usr
%patch0 -p1 -b .install-to-destdir-slash-usr
%patch1 -p1 -b .arm64-ilp32
%ifarch aarch64 aarch64_ilp32 x86_64
%patch2 -p1 -b .makefile-cflags
%endif
#%patch3 -p0 -b .makefile-destdir
#%patch3 -p1 -b .makefile-destdir
%patch3 -p1 -b .fix-x32
mv %{name}-%{version} setup-%{name}-%{version}