diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-01-09 21:02:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-01-09 21:02:12 +0000 |
| commit | fe4738688caefdb5b21f65b41908ff969cd91807 (patch) | |
| tree | 326d3acc715d9d50e3b8ead6460ff1ed316880f0 /dev-libs/libaio | |
| parent | Marked ppc/ppc64 stable for bug #254335. (diff) | |
| download | historical-fe4738688caefdb5b21f65b41908ff969cd91807.tar.gz historical-fe4738688caefdb5b21f65b41908ff969cd91807.tar.bz2 historical-fe4738688caefdb5b21f65b41908ff969cd91807.zip | |
tweak syscall() handling based on upstream comments
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64
Diffstat (limited to 'dev-libs/libaio')
| -rw-r--r-- | dev-libs/libaio/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch | 19 |
2 files changed, 15 insertions, 12 deletions
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index b3e57970a0c1..5edbbda034e3 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -3,7 +3,7 @@ Hash: SHA1 AUX libaio-0.3.104-build.patch 507 RMD160 7e5e0ac49d27c3bac6fb96af32d18070bd9d69d9 SHA1 863b92b51d4f420a885bfe8ae2919b85c6e7263a SHA256 c48e65bfd7ada197539e80323e481cfa0b9045360e845ffbeacf6600975957fd AUX libaio-0.3.106-build.patch 897 RMD160 59f63ebec2b753b114dd0a2e600faa55346b53f4 SHA1 b43f7c37de4918f14ea944aaee415fb710a443b9 SHA256 bea61cfeff24fb2fd37dd4dffc3dbe4ce98f32ddccb20f6462cf62ba16eaeee3 -AUX libaio-0.3.107-generic-arch.patch 3558 RMD160 85d331e60a33cacfa4482b5fc2f1ac6e12836489 SHA1 ad2ea02a093cfe47d6176b9f5a96bca3f1a80d16 SHA256 ed335ca3e2dae0ed95f8c096b3f17d169aba7bf75751d028897e62b667595e33 +AUX libaio-0.3.107-generic-arch.patch 3575 RMD160 e6721b1dfe7ab553a8a6f7e8c46b6b1c6d1f9cf3 SHA1 b8e7a2048ae46d0abbdf28dad3fc0773d53efe24 SHA256 06d717bb92f01e91166f52b597210b96a2b463eea29f4a0facc2221d558ea5e6 AUX libaio-0.3.107-install-to-slash.patch 1072 RMD160 2dc3e0b19a2a3e925ed02c6ff70cc5a4544a8dbd SHA1 f194309d2e25bc2254cbc6a4e1f5a7ce1b42876a SHA256 9405774a83dec8862002b185837495e96fa1c6753de18a8c0ea732cef525588c AUX libaio-0.3.107-sparc.patch 5331 RMD160 f265fe93f6c1fee7201a168b21cd3dfb00a33e1d SHA1 5af283341c55f7907b91266703417a1cfa3db296 SHA256 38cc2e213054332ba888cf5e3844e762374dd63f1537fd86ceebccfd516c1c45 AUX libaio-0.3.15-2.5-2-Makefile.patch 430 RMD160 2a3ec525be8d5ee1792cd2d71c9f0c007f63a47c SHA1 cc75aba705e9fb4a6f6c842b0145c2eaff0b5673 SHA256 cec7d9021ca1aff4c4c7014a7be9e82507bf3e051c9a643e2d0cec6cfbe67d46 @@ -22,7 +22,7 @@ MISC metadata.xml 435 RMD160 902bc4ecb946fdd64e3d1cc1ff3b70cfe14ca50c SHA1 5e182 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAklSYSEACgkQn/5bYzqsSmHNfQCfXsrDCcXDljY3qWL31m+7MGlR -l9IAnA+h8evtEufbJoHZSOxCWW5X1Cdo -=DH6M +iEYEARECAAYFAklnu1oACgkQn/5bYzqsSmE+pACdEBdrUxgc0RM3jMmKCmBzVQKF +SYQAoKaBq/+wXxNMfzVnFRdPQHZXYJhT +=ygJ/ -----END PGP SIGNATURE----- diff --git a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch b/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch index 3ad818962ce3..bb49eb2634dd 100644 --- a/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch +++ b/dev-libs/libaio/files/libaio-0.3.107-generic-arch.patch @@ -59,33 +59,36 @@ using standard syscall() function #endif --- /dev/null +++ src/syscall-generic.h -@@ -0,0 +1,26 @@ +@@ -0,0 +1,29 @@ +#include <errno.h> +#include <unistd.h> +#include <sys/syscall.h> + -+#define _ret_io_syscall(sname, args...) \ -+ return syscall(__NR_##sname, ## args) ? -errno : 0 ++#define _body_io_syscall(sname, args...) \ ++{ \ ++ int ret = syscall(__NR_##sname, ## args); \ ++ return ret < 0 ? -errno : ret; \ ++} + +#define io_syscall1(type,fname,sname,type1,arg1) \ +type fname(type1 arg1) \ -+{ _ret_io_syscall(sname, (long)arg1); } ++_body_io_syscall(sname, (long)arg1) + +#define io_syscall2(type,fname,sname,type1,arg1,type2,arg2) \ +type fname(type1 arg1,type2 arg2) \ -+{ _ret_io_syscall(sname, (long)arg1, (long)arg2); } ++_body_io_syscall(sname, (long)arg1, (long)arg2) + +#define io_syscall3(type,fname,sname,type1,arg1,type2,arg2,type3,arg3) \ +type fname(type1 arg1,type2 arg2,type3 arg3) \ -+{ _ret_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3); } ++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3) + +#define io_syscall4(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ +type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ -+{ _ret_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4); } ++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4) + +#define io_syscall5(type,fname,sname,type1,arg1,type2,arg2,type3,arg3,type4,arg4, type5,arg5) \ +type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ -+{ _ret_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5); } ++_body_io_syscall(sname, (long)arg1, (long)arg2, (long)arg3, (long)arg4, (long)arg5) --- src/syscall.h +++ src/syscall.h @@ -25,5 +25,6 @@ |