diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-15 10:24:37 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-15 10:24:37 +0000 |
| commit | 40e99d4a068c5c3e5031077ec692553755615197 (patch) | |
| tree | 76f2adf7463d6a686e01f86e93e76e933dd118b9 | |
| parent | 4a94698d16d850c868abfe5b966fd95cbe01e758 (diff) | |
libaio: revert __io_getevents_0_4.patch (FTBFS on x86) and fix ARM version of io_syscall5 as suggested by Jamie Lenehan
| -rw-r--r-- | packages/libaio/libaio-0.3.106/00_arches.patch | 2 | ||||
| -rw-r--r-- | packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch | 29 | ||||
| -rw-r--r-- | packages/libaio/libaio_0.3.106.bb | 3 |
3 files changed, 2 insertions, 32 deletions
diff --git a/packages/libaio/libaio-0.3.106/00_arches.patch b/packages/libaio/libaio-0.3.106/00_arches.patch index 7e8b569294..f4ca5ff11d 100644 --- a/packages/libaio/libaio-0.3.106/00_arches.patch +++ b/packages/libaio/libaio-0.3.106/00_arches.patch @@ -751,7 +751,7 @@ +} + +#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ -+type ffname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ ++type fname(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {\ + __SYS_REG(sname) \ + register long __r0 __asm__("r0") = (long)arg1; \ + register long __r1 __asm__("r1") = (long)arg2; \ diff --git a/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch b/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch deleted file mode 100644 index ce4578515c..0000000000 --- a/packages/libaio/libaio-0.3.106/__io_getevents_0_4.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Marcin Juszkiewicz <hrw@openembedded.org> - -Fast hack to get applications which use libaio linked. - -Get rid of: -/home/hrw/devel/build/dev/tmp/staging/arm-linux/lib/libaio.so: undefined reference to `__io_getevents_0_4' - -Index: libaio-0.3.106/src/io_getevents.c -=================================================================== ---- libaio-0.3.106.orig/src/io_getevents.c 2003-06-18 21:58:21.000000000 +0200 -+++ libaio-0.3.106/src/io_getevents.c 2006-10-14 19:42:49.000000000 +0200 -@@ -22,7 +22,7 @@ - #include <time.h> - #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 @@ - } - - 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/packages/libaio/libaio_0.3.106.bb b/packages/libaio/libaio_0.3.106.bb index e4d758c368..bc70bbe8d2 100644 --- a/packages/libaio/libaio_0.3.106.bb +++ b/packages/libaio/libaio_0.3.106.bb @@ -1,10 +1,9 @@ DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/liba/libaio/libaio_${PV}.orig.tar.gz \ file://00_arches.patch;patch=1 \ - file://__io_getevents_0_4.patch;patch=1 \ file://destdir.patch;patch=1" do_stage() { |