2016-10-14 07:49:11 +02:00

37 lines
1.6 KiB
Plaintext

$NetBSD: patch-ab,v 1.13 2016/04/20 15:00:04 mef Exp $
Changes:
o More general adaptation for BSDs
o Install scripts in DESTINSTALLSITESCRIPT instead of DESTINSTALLSCRIPT
o Ignore installed packlist when creating new packlist.
--- lib/ExtUtils/MM_Unix.pm.orig 2016-04-19 20:24:21.000000000 +0900
+++ lib/ExtUtils/MM_Unix.pm 2016-04-20 21:57:39.000000000 +0900
@@ -1022,7 +1022,7 @@ sub xs_make_dynamic_lib {
push(@m," \$(RM_F) \$\@\n");
my $libs = '$(LDLOADLIBS)';
- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
+ if (( $Is{BSD} || $Is{Interix} || $Is{Android}) && $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
@@ -2235,7 +2235,7 @@ q{ read "}.$self->catfile('$(PERL_ARCHL
q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
"$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
"$(INST_BIN)" "$(DESTINSTALLBIN)" \
- "$(INST_SCRIPT)" "$(DESTINSTALLSCRIPT)" \
+ "$(INST_SCRIPT)" "$(DESTINSTALLSITESCRIPT)" \
"$(INST_MAN1DIR)" "$(DESTINSTALLMAN1DIR)" \
"$(INST_MAN3DIR)" "$(DESTINSTALLMAN3DIR)"
$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
@@ -2246,7 +2246,7 @@ pure_site_install :: all
$(NOECHO) $(MOD_INSTALL) \
};
push @m,
-q{ read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+q{ read "" \
write "}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
} unless $self->{NO_PACKLIST};