commit 171550b8467f2c8e26b69af0136fba46d717ab09
Author: Jakub Bogusz <[email protected]>
Date: Sun Dec 1 12:09:55 2019 +0100
- updated to 0.3.112
- updated DESTDIR patch
- removed outdated link patch
libaio-DESTDIR.patch | 27 +++++++++++++++++++--------
libaio-link.patch | 13 -------------
libaio.spec | 14 +++++++-------
3 files changed, 26 insertions(+), 28 deletions(-)
---
diff --git a/libaio.spec b/libaio.spec
index 79fce08..cf04d06 100644
--- a/libaio.spec
+++ b/libaio.spec
@@ -5,19 +5,20 @@
Summary: Linux-native asynchronous I/O access library
Summary(pl.UTF-8): Biblioteka natywnego dla Linuksa asynchronicznego
dostępu do wejścia/wyjścia
Name: libaio
-Version: 0.3.111
+Version: 0.3.112
Release: 1
License: LGPL v2+
Group: Libraries
-Source0: http://releases.pagure.org/libaio/%{name}-%{version}.tar.gz
-# Source0-md5: abb8f46d64b9bd3d0c6097e3a36639be
+Source0: https://releases.pagure.org/libaio/%{name}-%{version}.tar.gz
+# Source0-md5: 1ba264947d05bd8e0f9dc9a9ed80cf3e
Patch0: %{name}-DESTDIR.patch
Patch1: %{name}-Werror.patch
Patch2: x32.patch
-Patch3: %{name}-link.patch
URL: https://pagure.io/libaio
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -fomit-frame-pointer
+
%description
The Linux-native asynchronous I/O facility ("async I/O", or "aio") has
a richer API and capability set than the simple POSIX async I/O
@@ -68,12 +69,11 @@ Statyczna biblioteka libaio.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
+CFLAGS="%{rpmcppflags} %{rpmcflags}" \
%{__make} \
- CC="%{__cc}" \
- CFLAGS="%{rpmcppflags} %{rpmcflags} -fomit-frame-pointer -fPIC -Wall
-I."
+ CC="%{__cc}"
%{?with_tests:%{__make} CC="%{__cc}" partcheck}
diff --git a/libaio-DESTDIR.patch b/libaio-DESTDIR.patch
index 4a9e4c4..fd4d8c8 100644
--- a/libaio-DESTDIR.patch
+++ b/libaio-DESTDIR.patch
@@ -1,6 +1,5 @@
-diff -up libaio-0.3.107/src/Makefile.orig libaio-0.3.107/src/Makefile
---- libaio-0.3.107/src/Makefile.orig 2009-01-20 10:07:31.520105235 -0500
-+++ libaio-0.3.107/src/Makefile 2009-01-20 10:08:51.199104930 -0500
+--- libaio-0.3.112/src/Makefile.orig 2018-10-22 21:59:34.000000000 +0200
++++ libaio-0.3.112/src/Makefile 2019-12-01 11:58:26.473877873 +0100
@@ -1,6 +1,7 @@
prefix=/usr
-includedir=$(prefix)/include
@@ -9,22 +8,34 @@ diff -up libaio-0.3.107/src/Makefile.orig
libaio-0.3.107/src/Makefile
+libdir=/usr/lib
+usrlibdir=/usr/lib
- ARCH := $(shell uname -m | sed -e s/i.86/i386/)
- CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC
-@@ -51,11 +52,11 @@ $(libname): $(libaio_sobjs) libaio.map
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -Wall -I. -fPIC
+@@ -58,12 +59,12 @@
$(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 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
-+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
+ ln -sf $(libname) $(DESTDIR)$(libdir)/$(soname)
+ ln -sf $(libdir)/$(libname) $(DESTDIR)$(usrlibdir)/libaio.so
+ endif
$(libaio_objs): libaio.h
+--- libaio-0.3.112/Makefile.orig 2018-10-22 21:59:34.000000000 +0200
++++ libaio-0.3.112/Makefile 2019-12-01 12:06:04.668062288 +0100
+@@ -14,7 +14,7 @@
+ @$(MAKE) -C src
+
+ install:
+- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix)
includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
++ @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir)
libdir=$(libdir)
+ check:
+ @$(MAKE) -C harness check
diff --git a/libaio-link.patch b/libaio-link.patch
deleted file mode 100644
index 3fc8497..0000000
--- a/libaio-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libaio-0.3.111/src/Makefile.orig 2018-04-16 20:52:01.924957883 +0200
-+++ libaio-0.3.111/src/Makefile 2018-04-16 20:52:10.001624445 +0200
-@@ -3,8 +3,8 @@
- libdir=/usr/lib
- usrlibdir=/usr/lib
-
--CFLAGS ?= -g -fomit-frame-pointer -O2
--CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
-+CFLAGS ?= -fomit-frame-pointer
-+CFLAGS += -Wall -I. -fPIC
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
- LINK_FLAGS=
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libaio.git/commitdiff/171550b8467f2c8e26b69af0136fba46d717ab09
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
