diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2009-10-10 22:48:35 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2009-10-10 22:48:35 +0000 |
| commit | ab2e0af3e3a7989d6a9ab38420b21dc306d13b17 (patch) | |
| tree | 0be40685719c73b328f7ff61e1a583a64e9293c4 | |
| parent | Remove --nobind from init script for bug #282721 (diff) | |
| download | gentoo-2-ab2e0af3e3a7989d6a9ab38420b21dc306d13b17.tar.gz gentoo-2-ab2e0af3e3a7989d6a9ab38420b21dc306d13b17.tar.bz2 gentoo-2-ab2e0af3e3a7989d6a9ab38420b21dc306d13b17.zip | |
Fix build with perl-5.10 with USE=-ithreads (#287654)
(Portage version: 2.2_rc44/cvs/Linux i686)
| -rw-r--r-- | app-editors/nvi/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch | 20 | ||||
| -rw-r--r-- | app-editors/nvi/nvi-1.81.6-r3.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog index 3f5c9920bfad..4617f1d7e571 100644 --- a/app-editors/nvi/ChangeLog +++ b/app-editors/nvi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/nvi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.73 2009/10/08 19:54:16 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.74 2009/10/10 22:48:34 truedfx Exp $ + + 10 Oct 2009; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild, + +files/nvi-1.81.6-perl-shortnames.patch: + Fix build with perl-5.10 with USE=-ithreads (#287654) 06 Oct 2009; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild, +files/nvi-1.81.6-perl-as-needed.patch: diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch new file mode 100644 index 000000000000..3b2de789b5b4 --- /dev/null +++ b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch @@ -0,0 +1,20 @@ +--- ../perl_api/perlsfio.c ++++ ../perl_api/perlsfio.c +@@ -32,6 +32,7 @@ + /* perl redefines them + * avoid warnings + */ ++#undef re_compile + #undef USE_DYNAMIC_LOADING + #undef DEBUG + #undef PACKAGE +--- ../perl_api/perl.xs ++++ ../perl_api/perl.xs +@@ -38,6 +38,7 @@ + /* perl redefines them + * avoid warnings + */ ++#undef re_compile + #undef USE_DYNAMIC_LOADING + #undef DEBUG + #undef PACKAGE diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild index e99f4860980a..1959ade5173f 100644 --- a/app-editors/nvi/nvi-1.81.6-r3.ebuild +++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.2 2009/10/08 19:54:16 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.3 2009/10/10 22:48:34 truedfx Exp $ inherit autotools db-use eutils flag-o-matic @@ -37,6 +37,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-db44.patch epatch "${FILESDIR}"/${P}-db.patch epatch "${FILESDIR}"/${P}-perl-as-needed.patch + epatch "${FILESDIR}"/${P}-perl-shortnames.patch cd ../dist || die chmod +x findconfig || die append-flags -I"$(db_includedir ${DBVERS})" |