diff options
author | Andrew Savchenko <bircoph@gentoo.org> | 2016-05-25 10:56:23 +0300 |
---|---|---|
committer | Andrew Savchenko <bircoph@gentoo.org> | 2016-05-25 10:56:23 +0300 |
commit | 352186c283d9543c7a5fe809933dbd2b2d22a98f (patch) | |
tree | 5a5500c82866d613d4429942fc48d3fca2d3976a /media-libs/svgalib | |
parent | dev-libs/libffi: Stable for HPPA PPC64 (bug #580616). (diff) | |
download | gentoo-352186c283d9543c7a5fe809933dbd2b2d22a98f.tar.gz gentoo-352186c283d9543c7a5fe809933dbd2b2d22a98f.tar.bz2 gentoo-352186c283d9543c7a5fe809933dbd2b2d22a98f.zip |
media-libs/svgalib: fix build failures
1. Bug 576260.
App code needs C89 extern inlines. The sanes way is to use
-fgnu89-inlines.
2. Bug 583726.
Use long instead of int to avoid incompatible pointer type errors
(starting with linux-4.6.0)
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Diffstat (limited to 'media-libs/svgalib')
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch | 2 | ||||
-rw-r--r-- | media-libs/svgalib/svgalib-1.9.25-r5.ebuild | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch index ad8d94cb8702..dbc0338cbfb5 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch @@ -10,7 +10,7 @@ static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { +#else -+static int svgalib_helper_ioctl(struct file *filp, ++static long svgalib_helper_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg) { + struct inode *inode=filp->f_dentry->d_inode; +#endif diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild index ca709273a98a..c315012aba4a 100644 --- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild +++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild @@ -46,6 +46,8 @@ src_compile() { use kernel-helper || export NO_HELPER=y export CC=$(tc-getCC) + # C89 extern inlines are needed, see #576260 + append-cflags -fgnu89-inline # First build static emake OPTIMIZE="${CFLAGS}" static |