diff options
Diffstat (limited to 'lang/julia/files/patch-Makefile')
| -rw-r--r-- | lang/julia/files/patch-Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 0a26e5e5db71..c817495edb4c 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,10 +1,15 @@ ---- Makefile.orig 2024-04-30 17:45:14 UTC +--- Makefile.orig 2024-08-27 21:19:31 UTC +++ Makefile -@@ -265,9 +265,9 @@ endef +@@ -265,13 +265,13 @@ define stringreplace + # Note that we disable MSYS2's path munging here, as otherwise + # it replaces our `:`-separated list as a `;`-separated one. + define stringreplace +- MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x - '$1' | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)" ++ MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x -a '$1' | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)" endef --install: $(build_depsbindir)/stringreplace docs +-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html +install: $(build_depsbindir)/stringreplace @$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE) - @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \ @@ -12,7 +17,7 @@ mkdir -p $(DESTDIR)$$subdir; \ done -@@ -366,8 +366,6 @@ endif +@@ -370,8 +370,6 @@ endif cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia @@ -21,7 +26,7 @@ # Remove various files which should not be installed -rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile -@@ -462,9 +460,9 @@ ifeq ($(OS),FreeBSD) +@@ -466,9 +464,9 @@ ifeq ($(OS),FreeBSD) # needs to be fixed here, as libgcc_s and libquadmath don't have RPATHs set. If we # don't set libgfortran's RPATH, it won't be able to find its friends on systems # that don't have the exact GCC port installed used for the build. @@ -34,12 +39,12 @@ endif mkdir -p $(DESTDIR)$(sysconfdir) -@@ -473,6 +471,10 @@ endif +@@ -477,6 +475,10 @@ endif ifeq ($(DARWIN_FRAMEWORK),1) $(MAKE) -C $(JULIAHOME)/contrib/mac/framework frameworknoinstall endif + -+install-docs: docs ++install-docs: $(BUILDROOT)/doc/_build/html/en/index.html + # Copy documentation + cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ |