[PATCH v3] perl: regenerate perl.mak if perl -V changes
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Mar 29, 2017, 13:57 UTC
- Message-ID
- <20170329135703.18860-1-avarab@gmail.com>
- In-Reply-To
- <39b203e9-c3a9-80c3-ec24-649e04ef5620@atlas-elektronik.com>
Change the perl/perl.mak build process so that the file is regenerated if the output of "perl -V" changes.
Before this change updating e.g. /usr/bin/perl to a new major version would cause the next "make" command to fail, since perl.mak has hardcoded paths to perl library paths retrieved from its first run.
Now the logic added in commit ee9be06770 ("perl: detect new files in MakeMaker builds", 2012-07-27) is extended to regenerate perl/perl.mak if there's any change to "perl -V".
This will in some cases redundantly trigger perl/perl.mak to be re-made, e.g. if @INC is modified in ways the build process doesn't care about through sitecustomize.pl, but the common case is that we just do the right thing and re-generate perl/perl.mak when needed.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> ---
On Wed, Mar 29, 2017 at 3:36 PM, <stefan.naewe@atlas-elektronik.com> wrote:
Show 11 quoted lines
> Am 29.03.2017 um 15:33 schrieb Ævar Arnfjörð Bjarmason:
> [...]
>> Now the logic added in commit ee9be06770 ("perl: detect new files in
>> MakeMaker builds", 2012-07-27) is extended to regeneratio
>
> s/regeneratio/regenerate/
>
>> [...]
>
>
> /SThanks!
Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile index 9f8b35ad41..485c453ca2 100644 --- a/Makefile +++ b/Makefile @@ -1851,6 +1851,7 @@ perl/perl.mak: perl/PM.stamp perl/PM.stamp: FORCE @$(FIND) perl -type f -name '*.pm' | sort >$@+ && \ + $(PERL_PATH) -V >>$@+ && \ { cmp $@+ $@ >/dev/null 2>/dev/null || mv $@+ $@; } && \ $(RM) $@+
-- 2.11.0