diff options
| -rw-r--r-- | gnu/usr.bin/perl/MANIFEST | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.SH | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/lib/Config_git.pl | 12 |
3 files changed, 19 insertions, 5 deletions
diff --git a/gnu/usr.bin/perl/MANIFEST b/gnu/usr.bin/perl/MANIFEST index d6146515228..3adc61afd0a 100644 --- a/gnu/usr.bin/perl/MANIFEST +++ b/gnu/usr.bin/perl/MANIFEST @@ -1592,6 +1592,7 @@ fakethr.h Fake threads header form.h Public declarations for formats generate_uudmap.c Generate uudmap.h, the uuencode decoding map genpacksizetables.pl Generate the size tables for pack/unpack +git_version.h Pre-generated git_version.h for OpenBSD globals.c File to declare global symbols (for shared library) global.sym Symbols that need hiding when embedded globvar.sym Global variables that need hiding when embedded @@ -1962,6 +1963,7 @@ lib/complete.pl A command completion subroutine lib/Config/Extensions.pm Convenient hash lookup for built extensions lib/Config/Extensions.t See if Config::Extensions works lib/Config.t See if Config works +lib/Config_git.pl Pre-generated git_version.h for OpenBSD lib/constant.pm For "use constant" lib/constant.t See if compile-time constants work lib/CORE.pod document the CORE namespace diff --git a/gnu/usr.bin/perl/Makefile.SH b/gnu/usr.bin/perl/Makefile.SH index 73891791d39..461c0530cde 100644 --- a/gnu/usr.bin/perl/Makefile.SH +++ b/gnu/usr.bin/perl/Makefile.SH @@ -381,7 +381,7 @@ CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@` CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<` CONFIGPM_FROM_CONFIG_SH = lib/Config.pm lib/Config_heavy.pl -CONFIGPM = $(CONFIGPM_FROM_CONFIG_SH) lib/Config_git.pl +CONFIGPM = $(CONFIGPM_FROM_CONFIG_SH) CONFIGPOD = lib/Config.pod @@ -413,7 +413,7 @@ esac ## In the following dollars and backticks do not need the extra backslash. $spitshell >>$Makefile <<'!NO!SUBS!' -private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm git_version.h +private = preplibrary $(CONFIGPM) $(CONFIGPOD) lib/ExtUtils/Miniperl.pm # Files to be built with variable substitution before miniperl # is available. @@ -552,8 +552,9 @@ sperl.i: perl.c $(h) .PHONY: all translators utilities -lib/Config_git.pl git_version.h: miniperl$(EXE_EXT) make_patchnum.pl - $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_patchnum.pl +# We use pre-generated lib/Config_git.pl and git_version.h files +#lib/Config_git.pl git_version.h: miniperl$(EXE_EXT) make_patchnum.pl +# $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_patchnum.pl # make sure that we recompile perl.c if the git version changes perl$(OBJ_EXT): git_version.h @@ -1245,7 +1246,6 @@ _tidy: -cd pod; $(LDLIBPTH) $(MAKE) clean -cd utils; $(LDLIBPTH) $(MAKE) clean -cd x2p; $(LDLIBPTH) $(MAKE) clean - -rm -f lib/Config_git.pl -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \ $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl --target=clean $$x MAKE=$(MAKE) ; \ done diff --git a/gnu/usr.bin/perl/lib/Config_git.pl b/gnu/usr.bin/perl/lib/Config_git.pl new file mode 100644 index 00000000000..6aacc4c1f4d --- /dev/null +++ b/gnu/usr.bin/perl/lib/Config_git.pl @@ -0,0 +1,12 @@ +###################################################################### +# WARNING: 'lib/Config_git.pl' is generated by make_patchnum.pl +# DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead +###################################################################### +$Config::Git_Data=<<'ENDOFGIT'; +git_commit_id='' +git_describe='' +git_branch='' +git_uncommitted_changes='' +git_commit_id_title='' + +ENDOFGIT |