From 2da83d3303334fc0e3a288982ab5c3473242162d0b5d2b29594ff5feaeebb5bb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 24 Mar 2011 08:43:42 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libaio revision 18.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libaio?expand=0&rev=46566b6434d805acdf5c3167c2d54813 --- libaio.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libaio.spec b/libaio.spec index 438c079..6cfc5e0 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,7 +1,7 @@ # -# spec file for package libaio (Version 0.3.107) +# spec file for package libaio # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,9 +28,9 @@ Obsoletes: libaio-64bit %endif # Version: 0.3.109 -Release: 0 +Release: 1 Summary: Linux-Native Asynchronous I/O Access Library -URL: http://kernel.org/pub/linux/libs/aio/ +Url: http://kernel.org/pub/linux/libs/aio/ Source: libaio-%{version}.tar.bz2 Source2: baselibs.conf Patch2: libaio-optflags.diff From d830b8919fc0075f8663b76aeb8d1082b0c441aac606a3f6dea211df4ce1e9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Sep 2011 12:45:17 +0000 Subject: [PATCH 2/2] Accepting request 85800 from home:adrianSuSE:branches:devel:libraries:c_c++ fix arm by droping arm hack ;) OBS-URL: https://build.opensuse.org/request/show/85800 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libaio?expand=0&rev=11 --- ARM_io_getevents.diff | 22 ---------------------- libaio.changes | 5 +++++ libaio.spec | 4 ---- 3 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 ARM_io_getevents.diff diff --git a/ARM_io_getevents.diff b/ARM_io_getevents.diff deleted file mode 100644 index 342fc0d..0000000 --- a/ARM_io_getevents.diff +++ /dev/null @@ -1,22 +0,0 @@ -# from http://projects.linuxtogo.org/pipermail/openembedded-commits/2006-October/001139.html -diff -Napur _/src/io_getevents.c libaio-0.3.104/src/io_getevents.c ---- _/src/io_getevents.c 2003-06-18 21:58:21.000000000 +0200 -+++ libaio-0.3.104/src/io_getevents.c 2009-07-30 01:15:06.687173277 +0200 -@@ -22,7 +22,7 @@ - #include - #include "syscall.h" - --io_syscall5(int, __io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout) -+io_syscall5(int, io_getevents_0_4, io_getevents, io_context_t, ctx, long, min_nr, long, nr, struct io_event *, events, struct timespec *, timeout) - - #define AIO_RING_MAGIC 0xa10a10a1 - -@@ -51,7 +51,7 @@ int io_getevents_0_4(io_context_t ctx, l - } - - do_syscall: -- return __io_getevents_0_4(ctx, min_nr, nr, events, timeout); -+ return io_getevents_0_4(ctx, min_nr, nr, events, timeout); - } - - DEFSYMVER(io_getevents_0_4, io_getevents, 0.4) diff --git a/libaio.changes b/libaio.changes index d5fdc49..7c2d68a 100644 --- a/libaio.changes +++ b/libaio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 30 12:36:33 UTC 2011 - adrian@suse.de + +- drop debian arm hack to fix build on arm ;) + ------------------------------------------------------------------- Tue Mar 15 13:44:15 UTC 2011 - jengelh@medozas.de diff --git a/libaio.spec b/libaio.spec index 6cfc5e0..0d3ea64 100644 --- a/libaio.spec +++ b/libaio.spec @@ -39,7 +39,6 @@ Patch4: 00_arches_sh.patch Patch5: 01_link_libgcc.patch Patch6: 02_libdevdir.patch Patch7: 03_man_errors.patch -Patch500: ARM_io_getevents.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,9 +73,6 @@ with, for the Linux-native asynchronous I/O facility ("async I/O", or %setup -q %patch2 -p1 %patch -p1 -P 3 -P 4 -P 5 -P 6 -P 7 -%ifarch %arm -%patch500 -p1 -%endif %build make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"