From f33cff88ea7a8a4a5327b849f4bd7b2ae7fc90ad Mon Sep 17 00:00:00 2001 From: Leon Timmermans Date: Sun, 13 May 2018 16:02:45 +0200 Subject: [PATCH] Add bmake compatibility code In bsd make $* only contains the directory of the file if it's run in compatability mode. This breaks with Moose's use of the xs/ directory. --- Changes | 5 +++++ inc/MMHelper.pm | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Changes b/Changes index ab63df322..d9eb4faec 100644 --- a/Changes +++ b/Changes @@ -8,6 +8,11 @@ for, noteworthy changes. - Moose::Manual::Construction now notes that roles can modify the BUILD sub. (thanks, E. Choroba!) + [OTHER] + + - adjustments have been made to the Makefile for 'bmake', so it now works + when not run in compatibility mode (Leon Timmermans). + 2.2010 2018-02-16 [OTHER] diff --git a/inc/MMHelper.pm b/inc/MMHelper.pm index 7e340b940..7a59d48f7 100644 --- a/inc/MMHelper.pm +++ b/inc/MMHelper.pm @@ -52,6 +52,23 @@ package MY; use Config; +# These two are necessary to keep bmake happy +sub xs_c { + my $self = shift; + my $ret = $self->SUPER::xs_c(@_); + $ret =~ s/\$\*\.xs/\$SUPER::c_o(@_); + $ret =~ s/\$\*\.c\b/\$SUPER::const_cccmd(@_); return q{} unless $ret;