diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-03-04 10:27:52 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-03-04 10:27:52 +0000 |
| commit | b947b6ea4914160a6d98b9accfba43a56935b814 (patch) | |
| tree | 34c86c3ff10796ffdaa982362888973f1945a667 /app-admin/analog | |
| parent | Move binary file away from CVS tree (diff) | |
| download | gentoo-2-b947b6ea4914160a6d98b9accfba43a56935b814.tar.gz gentoo-2-b947b6ea4914160a6d98b9accfba43a56935b814.tar.bz2 gentoo-2-b947b6ea4914160a6d98b9accfba43a56935b814.zip | |
Fix compilation, bug #398617 by Marcin Kowalski.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/analog')
| -rw-r--r-- | app-admin/analog/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/analog/analog-6.0-r4.ebuild | 10 | ||||
| -rw-r--r-- | app-admin/analog/files/analog-6.0-undefined-macro.patch | 38 |
3 files changed, 50 insertions, 6 deletions
diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog index 486b5923046c..edc38b3d720e 100644 --- a/app-admin/analog/ChangeLog +++ b/app-admin/analog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/analog -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.68 2011/07/15 15:25:21 xarthisius Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.69 2012/03/04 10:27:52 pacho Exp $ + + 04 Mar 2012; Pacho Ramos <pacho@gentoo.org> + +files/analog-6.0-undefined-macro.patch, analog-6.0-r4.ebuild: + Fix compilation, bug #398617 by Marcin Kowalski. 15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> -analog-6.0-r3.ebuild, analog-6.0-r4.ebuild: diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild index b23ce0ef7d57..75567e07d727 100644 --- a/app-admin/analog/analog-6.0-r4.ebuild +++ b/app-admin/analog/analog-6.0-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.9 2011/07/15 15:25:21 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.10 2012/03/04 10:27:52 pacho Exp $ EAPI=4 @@ -24,6 +24,8 @@ src_prepare() { cd src/ epatch "${FILESDIR}/${PN}-5.1-gentoo.diff" epatch "${FILESDIR}/${P}-bzip2.patch" + epatch "${FILESDIR}/${P}-undefined-macro.patch" + sed -i Makefile \ -e 's| -o | $(LDFLAGS)&|g' \ || die "sed Makefile" @@ -33,11 +35,11 @@ src_compile() { tc-export CC # emake in main dir just executes "cd src && make", # i.e. MAKEOPTS are ignored - emake -C src || die "make failed" + emake -C src } src_install() { - dobin analog || die "dobin failed" + dobin analog newman analog.man analog.1 dodoc README.txt Licence.txt analog.cfg diff --git a/app-admin/analog/files/analog-6.0-undefined-macro.patch b/app-admin/analog/files/analog-6.0-undefined-macro.patch new file mode 100644 index 000000000000..5a98541c465c --- /dev/null +++ b/app-admin/analog/files/analog-6.0-undefined-macro.patch @@ -0,0 +1,38 @@ +--- a/src/unzip/ioapi.h 2004-12-19 14:51:32.000000000 +0100 ++++ b/src/unzip/ioapi.h 2012-01-11 18:07:59.570768250 +0100 +@@ -35,6 +35,16 @@ + extern "C" { + #endif + ++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */ ++#ifndef OF ++#ifdef __STDC__ ++#define OF(x) x ++#else ++#define OF(x) () ++#endif ++#endif ++ ++ + typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); + typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); + typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); +--- a/src/unzip/unzip.h 2004-12-19 14:51:32.000000000 +0100 ++++ b/src/unzip/unzip.h 2012-01-11 18:00:25.988120225 +0100 +@@ -47,6 +47,15 @@ + extern "C" { + #endif + ++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */ ++#ifndef OF ++#ifdef __STDC__ ++#define OF(x) x ++#else ++#define OF(x) () ++#endif ++#endif ++ + #ifndef _ZLIB_H + #include "../zlib/zlib.h" + #endif + |