Skip to content

Commit

Permalink
perl-Module-Build: Update to 0.4224
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexpux committed Feb 14, 2018
1 parent cad4f80 commit 83cc2a3
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 38 deletions.
24 changes: 12 additions & 12 deletions perl-Module-Build/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@

_realname=Module-Build
pkgname=perl-${_realname}
pkgver=0.4212
pkgver=0.4224
pkgrel=1
pkgdesc="Build, test, and install Perl modules"
arch=('any')
url="http://search.cpan.org/dist/Module-Build"
license=('PerlArtistic' 'GPL')
depends=('perl>=5.8.0' 'perl-CPAN-Meta>=2.142060')
depends=('perl>=5.8.0' 'perl-CPAN-Meta>=2.142060' 'perl-inc-latest')
options=('!emptydirs')
source=(https://www.cpan.org/authors/id/L/LE/LEONT/${_realname}-$pkgver.tar.gz
module-build-0.4212-msysize.patch)
sha512sums=('5677decbb11194f5657e7436abb24afd9697021e924cd33db92da04be4a467d99fd9d587e62ccd865ef4f2120f7dad5e5ee38a7ae14f65d73e080f1bf6bc6147'
'9483ac219e01d773db58a80e65111f47872d3009c67801b1b7caada50042b39f942ec2fbe6fa1d1269fc3e8b878ca87e02e9c1fa23746fdc2a48e6bf84dceb25')
source=(https://www.cpan.org/authors/id/L/LE/LEONT/${_realname}-${pkgver}.tar.gz
module-build-0.4224-msysize.patch)
sha512sums=('c08e84c542a882aa16a682a81cbb7a4860774a3f6a0ec2e720ba9e9bcea76dab331999fee86bf8b92edc08560d7cef4a7c2dfa4e626ab9b22da965e715af531f'
'543439db152a56fb4881e4881637e2ef8bf30443436857bae32a4f69dfb033490e271c3fb965763b64e5691d362076cd271ad4ef161fc58219bfae6a6dd59902')

prepare() {
cd ${_realname}-$pkgver
patch -p1 -i ${srcdir}/module-build-0.4212-msysize.patch
cd ${_realname}-${pkgver}
patch -p1 -i ${srcdir}/module-build-0.4224-msysize.patch
}

build() {
cd ${_realname}-$pkgver
cd ${_realname}-${pkgver}
perl Build.PL installdirs=vendor
perl Build
}

check() {
cd ${_realname}-$pkgver
cd ${_realname}-${pkgver}
perl Build test
}

package() {
cd ${_realname}-$pkgver
perl Build install destdir="$pkgdir"
cd ${_realname}-${pkgver}
perl Build install destdir="${pkgdir}"
}
26 changes: 0 additions & 26 deletions perl-Module-Build/module-build-0.4212-msysize.patch

This file was deleted.

113 changes: 113 additions & 0 deletions perl-Module-Build/module-build-0.4224-msysize.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
diff -Naur Module-Build-0.4224/inc/Perl/OSType.pm Module-Build-0.4224-msys/inc/Perl/OSType.pm
--- Module-Build-0.4224/inc/Perl/OSType.pm 2017-05-30 21:03:05.000000000 +0300
+++ Module-Build-0.4224-msys/inc/Perl/OSType.pm 2018-02-14 12:07:45.377789700 +0300
@@ -54,6 +54,7 @@
solaris Unix
sunos Unix
cygwin Unix
+ msys Unix
os2 Unix
interix Unix
gnu Unix
diff -Naur Module-Build-0.4224/lib/Module/Build/Platform/msys.pm Module-Build-0.4224-msys/lib/Module/Build/Platform/msys.pm
--- Module-Build-0.4224/lib/Module/Build/Platform/msys.pm 1970-01-01 03:00:00.000000000 +0300
+++ Module-Build-0.4224-msys/lib/Module/Build/Platform/msys.pm 2018-02-14 12:41:13.498755300 +0300
@@ -0,0 +1,54 @@
+package Module::Build::Platform::msys;
+
+use strict;
+use warnings;
+our $VERSION = '0.4224';
+$VERSION = eval $VERSION;
+use Module::Build::Platform::Unix;
+
+our @ISA = qw(Module::Build::Platform::Unix);
+
+sub manpage_separator {
+ '.'
+}
+
+# Copied from ExtUtils::MM_Cygwin::maybe_command()
+# If our path begins with F</cygdrive/> then we use the Windows version
+# to determine if it may be a command. Otherwise we use the tests
+# from C<ExtUtils::MM_Unix>.
+
+sub _maybe_command {
+ my ($self, $file) = @_;
+
+ if ($file =~ m{^/cygdrive/}i) {
+ require Module::Build::Platform::Windows;
+ return Module::Build::Platform::Windows->_maybe_command($file);
+ }
+
+ return $self->SUPER::_maybe_command($file);
+}
+
+1;
+__END__
+
+
+=head1 NAME
+
+Module::Build::Platform::msys - Builder class for MSYS2 platform
+
+=head1 DESCRIPTION
+
+This module provides some routines very specific to the msys2
+platform.
+
+Please see the L<Module::Build> for the general docs.
+
+=head1 AUTHOR
+
+Initial stub by Yitzchak Scott-Thoennes <sthoenna@efn.org>
+
+=head1 SEE ALSO
+
+perl(1), Module::Build(3), ExtUtils::MakeMaker(3)
+
+=cut
diff -Naur Module-Build-0.4224/META.json Module-Build-0.4224-msys/META.json
--- Module-Build-0.4224/META.json 2018-02-14 12:41:52.972323600 +0300
+++ Module-Build-0.4224-msys/META.json 2018-02-14 13:01:45.253677800 +0300
@@ -129,6 +129,10 @@
"file" : "lib/Module/Build/Platform/cygwin.pm",
"version" : "0.4224"
},
+ "Module::Build::Platform::msys" : {
+ "file" : "lib/Module/Build/Platform/msys.pm",
+ "version" : "0.4224"
+ },
"Module::Build::Platform::darwin" : {
"file" : "lib/Module/Build/Platform/darwin.pm",
"version" : "0.4224"
diff -Naur Module-Build-0.4224/META.yml Module-Build-0.4224-msys/META.yml
--- Module-Build-0.4224/META.yml 2017-05-30 21:03:05.000000000 +0300
+++ Module-Build-0.4224-msys/META.yml 2018-02-14 13:02:13.315584000 +0300
@@ -70,6 +70,9 @@
Module::Build::Platform::cygwin:
file: lib/Module/Build/Platform/cygwin.pm
version: '0.4224'
+ Module::Build::Platform::msys:
+ file: lib/Module/Build/Platform/msys.pm
+ version: '0.4224'
Module::Build::Platform::darwin:
file: lib/Module/Build/Platform/darwin.pm
version: '0.4224'
diff -Naur Module-Build-0.4224/t/destinations.t Module-Build-0.4224-msys/t/destinations.t
--- Module-Build-0.4224/t/destinations.t 2017-05-30 21:03:05.000000000 +0300
+++ Module-Build-0.4224-msys/t/destinations.t 2018-02-14 12:07:45.377789700 +0300
@@ -300,11 +300,11 @@
sub have_same_ending {
my ($dir1, $dir2, $message) = @_;

- $dir1 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
+ $dir1 =~ s{/$}{} if $^O eq 'cygwin' || $^O eq 'msys'; # remove any trailing slash
my (undef, $dirs1, undef) = splitpath $dir1;
my @dir1 = splitdir $dirs1;

- $dir2 =~ s{/$}{} if $^O eq 'cygwin'; # remove any trailing slash
+ $dir2 =~ s{/$}{} if $^O eq 'cygwin' || $^O eq 'msys'; # remove any trailing slash
my (undef, $dirs2, undef) = splitpath $dir2;
my @dir2 = splitdir $dirs2;

0 comments on commit 83cc2a3

Please sign in to comment.