diff options
Diffstat (limited to 'lang/julia/files/patch-Makefile')
| -rw-r--r-- | lang/julia/files/patch-Makefile | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 29ecc13e278a..f8824c92ce41 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,38 +1,42 @@ ---- Makefile.orig 2017-05-08 07:00:02 UTC +--- Makefile.orig 2017-06-19 17:48:45 UTC +++ Makefile -@@ -63,11 +63,6 @@ CLEAN_TARGETS += clean-docdir - clean-docdir: - @-rm -fr $(abspath $(build_docdir)) - $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/examples/*.jl) $(shell find $(JULIAHOME)/examples/clustermanager) -- @echo Copying in usr/share/doc/julia/examples -- @-rm -fr $(build_docdir)/examples -- @mkdir -p $(build_docdir)/examples -- @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/ -- @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/ +@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $( + @mkdir -p $(build_docdir)/examples + @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/ + @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/ +- @cp -R $(JULIAHOME)/examples/embedding $(build_docdir)/examples @echo 1 > $@ julia-symlink: julia-ui-$(JULIA_BUILD_MODE) -@@ -328,7 +323,7 @@ define stringreplace +@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : juli + julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% + @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$* + +-julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) $(build_prefix)/.examples ++julia-inference : julia-base julia-ui-$(JULIA_BUILD_MODE) + @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) + + ifneq ($(CPUID_SPECIFIC_BINARIES), 0) +@@ -332,7 +331,7 @@ 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 $(BUILDROOT)/doc/_build/html +-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html +install: $(build_depsbindir)/stringreplace @$(MAKE) $(QUIET_MAKE) all - @for subdir in $(bindir) $(libexecdir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ + @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ mkdir -p $(DESTDIR)$$subdir; \ -@@ -389,10 +384,6 @@ endif - $(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/ +@@ -377,9 +376,6 @@ endif + $(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/ # Copy in all .jl sources as well cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/ - # Copy documentation - cp -R -L $(build_docdir)/* $(DESTDIR)$(docdir)/ - cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ -- -rm $(DESTDIR)$(docdir)/html/.buildinfo # Remove perf suite -rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/ # Remove various files which should not be installed -@@ -400,38 +391,44 @@ endif +@@ -387,38 +383,44 @@ endif -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile # Copy in beautiful new man page $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ @@ -72,8 +76,8 @@ cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/ +install-docs: ++ # Copy documentation + cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ -+ rm $(DESTDIR)$(docdir)/html/.buildinfo + +install-examples: + mkdir -p $(DESTDIR)$(datarootdir)/examples/julia/ |