diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-02 10:04:11 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-02 10:06:31 +0100 |
| commit | 54c5cda4372004c31c5b91cb3f5cbc77da776512 (patch) | |
| tree | 5addaade628a164473f2049fe9cb095440029eb3 /media-sound/xmms2 | |
| parent | dev-lang/ocaml: add flambda useflag (diff) | |
| download | gentoo-54c5cda4372004c31c5b91cb3f5cbc77da776512.tar.gz gentoo-54c5cda4372004c31c5b91cb3f5cbc77da776512.tar.bz2 gentoo-54c5cda4372004c31c5b91cb3f5cbc77da776512.zip | |
media-sound/xmms2: tweak ExtUtils detection against perl-5.22, bug #578778
Reported-by: Scott McClung
Bug: https://bugs.gentoo.org/578778
Package-Manager: portage-2.2.28
Diffstat (limited to 'media-sound/xmms2')
| -rw-r--r-- | media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch | 5 | ||||
| -rw-r--r-- | media-sound/xmms2/xmms2-0.8-r2.ebuild | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch index d4c10b98548a..220e91e68136 100644 --- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch +++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch @@ -9,6 +9,7 @@ Use xsubpp from @INC instead of bundled one with perl. Original bug: https://bugs.gentoo.org/380469 Related: https://bugs.gentoo.org/378783 +Updated for perl-5.20.2: https://bugs.gentoo.org/578778 diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py index 2c69fe5..a75b069 100644 --- a/waflib/Tools/perl.py @@ -19,8 +20,8 @@ index 2c69fe5..a75b069 100644 env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") - env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") - env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") -+ env["XSUBPP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'") -+ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'") ++ env["XSUBPP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'") ++ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'") if not getattr(Options.options,'perlarchdir',None): env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") else: diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild index f424d494144b..4db611841035 100644 --- a/media-sound/xmms2/xmms2-0.8-r2.ebuild +++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild @@ -70,7 +70,8 @@ RDEPEND="server? ( DEPEND="${RDEPEND} dev-lang/python python? ( dev-python/pyrex ) - perl? ( dev-perl/Module-Build ) + perl? ( dev-perl/Module-Build + virtual/perl-Module-Metadata ) virtual/pkgconfig test? ( dev-util/cunit ) " @@ -105,7 +106,7 @@ pkg_setup() { src_prepare() { ./waf # inflate waf cd .waf* || die - epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch + epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778 cd "${S}" epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256 epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256 |