35 lines
1.4 KiB
Plaintext
35 lines
1.4 KiB
Plaintext
$NetBSD: patch-aa,v 1.36 2014/05/29 07:57:07 adam Exp $
|
|
|
|
* $Is{NetBSD} and $Is{Interix} are unified into $Is{BSD}.
|
|
* Ignore installed packlist when creating new packlist.
|
|
|
|
--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2014-05-26 13:34:19.000000000 +0000
|
|
+++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
|
|
@@ -29,8 +29,6 @@ BEGIN {
|
|
$Is{VMS} = $^O eq 'VMS';
|
|
$Is{OSF} = $^O eq 'dec_osf';
|
|
$Is{IRIX} = $^O eq 'irix';
|
|
- $Is{NetBSD} = $^O eq 'netbsd';
|
|
- $Is{Interix} = $^O eq 'interix';
|
|
$Is{SunOS4} = $^O eq 'sunos';
|
|
$Is{Solaris} = $^O eq 'solaris';
|
|
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
|
|
@@ -934,7 +932,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
|
|
|
|
my $libs = '$(LDLOADLIBS)';
|
|
|
|
- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
|
|
+ if ($Is{BSD} && $Config{'useshrplib'} eq 'true') {
|
|
# Use nothing on static perl platforms, and to the flags needed
|
|
# to link against the shared libperl library on shared perl
|
|
# platforms. We peek at lddlflags to see if we need -Wl,-R
|
|
@@ -2116,7 +2114,7 @@ pure_vendor_install :: all
|
|
$(NOECHO) $(MOD_INSTALL) \
|
|
};
|
|
push @m,
|
|
-q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
|
|
+q{ read "" \
|
|
write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
|
|
} unless $self->{NO_PACKLIST};
|
|
|