mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-10 00:10:19 +03:00
dev-perl/IO-Compress-Brotli: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
parent
0d51b710cc
commit
695f1ecc3e
@ -1,55 +0,0 @@
|
||||
From 59541041bc3b39e8539fd12a8e584a63040ad7a5 Mon Sep 17 00:00:00 2001
|
||||
From: Kent Fredric <kentnl@gentoo.org>
|
||||
Date: Tue, 4 Feb 2020 23:17:49 +1300
|
||||
Subject: Disable using bundled brotli
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index 57063cf..809001a 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -1,6 +1,5 @@
|
||||
use 5.014000;
|
||||
use ExtUtils::MakeMaker;
|
||||
-use Alien::cmake3;
|
||||
use File::Spec::Functions qw/catfile/;
|
||||
use Config;
|
||||
|
||||
@@ -18,6 +17,12 @@ if ($Config{myuname} =~ /strawberry/i || $Config{osname} =~ /MSWin/i ) {
|
||||
}
|
||||
}
|
||||
|
||||
+my $bundled = $ENV{IO_COMPRESS_BROTLI_BUNDLED} || 0;
|
||||
+
|
||||
+# Avoid unnecessary dependency
|
||||
+use if $bundled, 'Alien::cmake3';
|
||||
+
|
||||
+
|
||||
WriteMakefile(
|
||||
NAME => 'IO::Compress::Brotli',
|
||||
VERSION_FROM => 'lib/IO/Compress/Brotli.pm',
|
||||
@@ -32,6 +37,7 @@ WriteMakefile(
|
||||
'Getopt::Long' => '0',
|
||||
'Time::HiRes' => '0',
|
||||
},
|
||||
+ ( $bundled ) ? (
|
||||
CONFIGURE_REQUIRES => {
|
||||
'Alien::cmake3' => '0',
|
||||
},
|
||||
@@ -41,6 +47,9 @@ WriteMakefile(
|
||||
INC => '-Ibrotli/c/include',
|
||||
MYEXTLIB => $myextlib,
|
||||
clean => { FILES => "brotli/Makefile $myextlib brotli/CMakeCache.txt brotli/CMakeFiles/* brotli/CTestTestfile.cmake brotli/DartConfiguration.tcl brotli/brotli* brotli/cmake_install.cmake brotli/libbrotlicommon.pc brotli/libbrotlidec.pc brotli/libbrotlienc.pc" },
|
||||
+ ) : (
|
||||
+ LIBS => ['-lbrotlienc -lbrotlidec'],
|
||||
+ ),
|
||||
META_ADD => {
|
||||
dynamic_config => 0,
|
||||
resources => {
|
||||
@@ -50,6 +59,7 @@ WriteMakefile(
|
||||
);
|
||||
|
||||
sub MY::postamble {
|
||||
+ return '' unless $bundled;
|
||||
my @dirs = Alien::cmake3->bin_dir;
|
||||
my $cmake = defined $dirs[0] ? catfile($dirs[0] , Alien::cmake3->exe) : Alien::cmake3->exe;
|
||||
'
|
||||
Loading…
x
Reference in New Issue
Block a user