'make install' fixes to allow building RPM nightlies again #19539
Conversation
nalimilan
changed the title
nalimilan
changed the title
| @@ -5,7 +5,7 @@ default: html | |||
| # You can set these variables from the command line. | |||
| SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) | |||
| JULIAHOME := $(abspath $(SRCDIR)/..) | |||
| JULIA_EXECUTABLE := $(JULIAHOME)/usr/bin/julia | |||
| JULIA_EXECUTABLE := $(build_bindir)/julia | |||
There was a problem hiding this comment.
build_bindir won't usually be defined here
There was a problem hiding this comment.
Ah, indeed. I've changed the commit to include Make.inc, just like e.g. src/Makefile.
| @@ -316,9 +316,8 @@ define stringreplace | |||
| $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" | |||
| endef | |||
|
|
|||
| install: $(build_depsbindir)/stringreplace | |||
| install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html | |||
There was a problem hiding this comment.
we should try to ensure somehow that this is up to date, so we don't use a stale copy
There was a problem hiding this comment.
I guess we could list all files under base and doc as dependencies so that make compares their timestamps to that of the html directory. Looks like this would do the trick. How does that sound?
There was a problem hiding this comment.
I've added a commit doing that.
'make install' failed when setting build_bindir since docs/Makefile expected the julia executable to be under $(JULIAHOME)/usr/bin/.
There's not point in rebuilding docs if they are up-to-date, and this allows building tarballs (which already include HTML docs) without Internet access.
nalimilan
changed the title
|
Good to merge now? |
| @@ -5,7 +5,8 @@ default: html | |||
| # You can set these variables from the command line. | |||
| SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) | |||
| JULIAHOME := $(abspath $(SRCDIR)/..) | |||
| JULIA_EXECUTABLE := $(JULIAHOME)/usr/bin/julia | |||
| include $(JULIAHOME)/Make.inc | |||
There was a problem hiding this comment.
do you run this often in a context where you couldn't set JULIA_EXECUTABLE to reflect the custom bindir?
There was a problem hiding this comment.
Probably not, but I couldn't find a drawback to doing things that way. It's also more consistent with other Makefiles. I can remove it if you like.
There was a problem hiding this comment.
presumably there's some reason it wasn't doing this include before?
There was a problem hiding this comment.
Hard to tell. Anyway, as I said, I can remove it if you want.
There was a problem hiding this comment.
I'm coming up with some workarounds for the windows buildbot issues where it turns out it would be useful to have included Make.inc in this file, so merging.
|
I'll merge tomorrow barring objections. |
The first commit fixes
make installwith a custombuild_bindir. The second one avoids building docs when they are already present (like in tarballs), to avoid requiring an Internet connexion (not available for good reasons in RPM build machines).This fixes failures introduced by #18588.