diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-09-12 17:19:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-09-12 17:19:23 +0000 |
| commit | bf3f931045a4f693184a857427f1584606c952bb (patch) | |
| tree | ccea6950757cfd5687a7d0eee67a208734e09c7d | |
| parent | Version bump and remove old. (diff) | |
| download | gentoo-2-bf3f931045a4f693184a857427f1584606c952bb.tar.gz gentoo-2-bf3f931045a4f693184a857427f1584606c952bb.tar.bz2 gentoo-2-bf3f931045a4f693184a857427f1584606c952bb.zip | |
Fix building with perl useflag enabled. Per bug #336839.
(Portage version: 2.2_rc80/cvs/Linux x86_64)
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.4-r2.ebuild | 3 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.4.4-perl-includes.patch | 12 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 25c24ce6baab..67a9e1739841 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.398 2010/09/11 12:10:19 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.399 2010/09/12 17:19:23 scarabeus Exp $ + + 12 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.4-r2.ebuild, + +files/cups-1.4.4-perl-includes.patch: + Fix building with perl useflag enabled. Per bug #336839. *cups-1.4.4-r2 (11 Sep 2010) diff --git a/net-print/cups/cups-1.4.4-r2.ebuild b/net-print/cups/cups-1.4.4-r2.ebuild index 6cbae600fdb9..b1d35a65500e 100644 --- a/net-print/cups/cups-1.4.4-r2.ebuild +++ b/net-print/cups/cups-1.4.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r2.ebuild,v 1.2 2010/09/11 17:53:40 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.4-r2.ebuild,v 1.3 2010/09/12 17:19:23 scarabeus Exp $ EAPI=3 @@ -88,6 +88,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch" epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" + epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" AT_M4DIR=config-scripts eaclocal eautoconf diff --git a/net-print/cups/files/cups-1.4.4-perl-includes.patch b/net-print/cups/files/cups-1.4.4-perl-includes.patch new file mode 100644 index 000000000000..677c57ded88a --- /dev/null +++ b/net-print/cups/files/cups-1.4.4-perl-includes.patch @@ -0,0 +1,12 @@ +diff -urN cups-1.4.4/scripting/perl/Makefile.PL cups-1.4.4.new//scripting/perl/Makefile.PL +--- cups-1.4.4/scripting/perl/Makefile.PL 2002-08-19 22:43:03.000000000 +0200 ++++ cups-1.4.4.new//scripting/perl/Makefile.PL 2010-09-12 19:12:53.173000149 +0200 +@@ -11,7 +11,7 @@ + 'LIBS' => ['-lcups '], # e.g., '-lm' + 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' + # Insert -I. if you add *.h files later: +- 'INC' => '', # e.g., '-I/usr/include/other' ++ 'INC' => '-I../../', # e.g., '-I/usr/include/other' + # Un-comment this if you add C files to link with later: + # 'OBJECT' => '$(O_FILES)', # link all the C files too + ); |