diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-21 14:55:16 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-21 14:55:16 +0000 |
| commit | ebc08948fc2a00186b2c79edd0bf9fdf5a3ce8b7 (patch) | |
| tree | 5192c995354765927cbb5056ea7e0ed0e3b5f189 /sys-fs | |
| parent | Bump -6.3 development version (diff) | |
| download | gentoo-2-ebc08948fc2a00186b2c79edd0bf9fdf5a3ce8b7.tar.gz gentoo-2-ebc08948fc2a00186b2c79edd0bf9fdf5a3ce8b7.tar.bz2 gentoo-2-ebc08948fc2a00186b2c79edd0bf9fdf5a3ce8b7.zip | |
Fix missing #include <sys/wait.h> for #define's of WIFEXITED and WEXITSTATUS (to fix building on arch sh) wrt #462784
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udisks/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/udisks/files/udisks-2.1.0-W_define.patch | 15 | ||||
| -rw-r--r-- | sys-fs/udisks/udisks-2.1.0.ebuild | 6 |
3 files changed, 25 insertions, 3 deletions
diff --git a/sys-fs/udisks/ChangeLog b/sys-fs/udisks/ChangeLog index aa3e56eaa82a..2aaa1bf83c89 100644 --- a/sys-fs/udisks/ChangeLog +++ b/sys-fs/udisks/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/udisks # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.140 2013/04/12 17:21:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/ChangeLog,v 1.141 2013/04/21 14:55:16 ssuominen Exp $ + + 21 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> udisks-2.1.0.ebuild, + +files/udisks-2.1.0-W_define.patch: + Fix missing #include <sys/wait.h> for #define's of WIFEXITED and WEXITSTATUS + (to fix building on arch sh) wrt #462784 12 Apr 2013; Agostino Sarubbo <ago@gentoo.org> udisks-1.0.4-r5.ebuild, udisks-2.1.0.ebuild: diff --git a/sys-fs/udisks/files/udisks-2.1.0-W_define.patch b/sys-fs/udisks/files/udisks-2.1.0-W_define.patch new file mode 100644 index 000000000000..fd82ba170b80 --- /dev/null +++ b/sys-fs/udisks/files/udisks-2.1.0-W_define.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/462784 + +udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WIFEXITED' [-Werror=implicit-function-declaration] +udiskslinuxfilesystem.c:1294:11: error: implicit declaration of function 'WEXITSTATUS' [-Werror=implicit-function-declaration] + +--- src/udiskslinuxfilesystem.c ++++ src/udiskslinuxfilesystem.c +@@ -22,6 +22,7 @@ + #include <glib/gi18n-lib.h> + + #include <sys/types.h> ++#include <sys/wait.h> + #include <pwd.h> + #include <grp.h> + #include <string.h> diff --git a/sys-fs/udisks/udisks-2.1.0.ebuild b/sys-fs/udisks/udisks-2.1.0.ebuild index 710a8e5c3d72..0442f6a4fbbf 100644 --- a/sys-fs/udisks/udisks-2.1.0.ebuild +++ b/sys-fs/udisks/udisks-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.10 2013/04/12 17:21:00 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udisks/udisks-2.1.0.ebuild,v 1.11 2013/04/21 14:55:16 ssuominen Exp $ EAPI=5 inherit bash-completion-r1 eutils linux-info systemd udev @@ -56,7 +56,9 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-ieee1394.patch + epatch \ + "${FILESDIR}"/${P}-ieee1394.patch \ + "${FILESDIR}"/${P}-W_define.patch use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; } } |