diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2017-06-14 05:42:16 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2017-06-14 05:42:16 +0000 |
| commit | 3fc9aeb44ed4eed5fe2ead099b10feb13d64cd2c (patch) | |
| tree | 39980ed0b26593006de77616fbf5c13d35ef270c /lang/julia/files | |
| parent | Remove www/py-vcrpy, duplicate of devel/py-vcrpy (diff) | |
- Update to 0.5.2
PR: 219959
Submitted by: Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)
Notes
Notes:
svn path=/head/; revision=443554
Diffstat (limited to 'lang/julia/files')
| -rw-r--r-- | lang/julia/files/patch-Make.inc | 6 | ||||
| -rw-r--r-- | lang/julia/files/patch-Makefile | 29 |
2 files changed, 23 insertions, 12 deletions
diff --git a/lang/julia/files/patch-Make.inc b/lang/julia/files/patch-Make.inc index 965b62a3abb1..bbf92669da90 100644 --- a/lang/julia/files/patch-Make.inc +++ b/lang/julia/files/patch-Make.inc @@ -1,4 +1,4 @@ ---- Make.inc.orig 2016-09-20 02:54:21 UTC +--- Make.inc.orig 2017-05-08 07:00:02 UTC +++ Make.inc @@ -128,12 +128,7 @@ endif # disable automatic Makefile rules @@ -40,7 +40,7 @@ endif STDLIBCPP_FLAG := -@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-function +@@ -393,14 +388,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions endif ifeq ($(USECLANG),1) @@ -58,7 +58,7 @@ ifeq ($(OS), Darwin) ifeq ($(USE_LIBCPP), 1) CC += -stdlib=libc++ -mmacosx-version-min=10.7 -@@ -832,7 +827,7 @@ endif +@@ -833,7 +828,7 @@ endif ifeq ($(USE_SYSTEM_UTF8PROC), 1) LIBUTF8PROC := -lutf8proc diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 91e7e3bdf5a0..29ecc13e278a 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,16 +1,27 @@ ---- Makefile.orig 2017-03-06 03:32:23 UTC +--- Makefile.orig 2017-05-08 07:00:02 UTC +++ Makefile -@@ -328,8 +328,7 @@ define stringreplace +@@ -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/ + @echo 1 > $@ + + julia-symlink: julia-ui-$(JULIA_BUILD_MODE) +@@ -328,7 +323,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 -- @$(MAKE) $(QUIET_MAKE) all -+install: $(build_depsbindir)/stringreplace default ++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 \ mkdir -p $(DESTDIR)$$subdir; \ - done -@@ -389,10 +388,6 @@ endif +@@ -389,10 +384,6 @@ endif $(INSTALL_M) $(JULIAHOME)/contrib/julia-config.jl $(DESTDIR)$(datarootdir)/julia/ # Copy in all .jl sources as well cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/ @@ -21,7 +32,7 @@ # Remove perf suite -rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/ # Remove various files which should not be installed -@@ -400,38 +395,44 @@ endif +@@ -400,38 +391,44 @@ endif -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile # Copy in beautiful new man page $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ @@ -43,7 +54,7 @@ ifeq ($(OS), Darwin) for julia in $(DESTDIR)$(bindir)/julia* ; do \ install_name_tool -rpath @executable_path/$(build_private_libdir_rel) @executable_path/$(private_libdir_rel) $$julia; \ - install_name_tool -rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \ + install_name_tool -add_rpath @executable_path/$(build_libdir_rel) @executable_path/$(libdir_rel) $$julia; \ done -else ifeq ($(OS), Linux) +else @@ -61,7 +72,6 @@ cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/ +install-docs: -+ mkdir -p $(DESTDIR)$(docdir)/ + cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ + rm $(DESTDIR)$(docdir)/html/.buildinfo + @@ -74,6 +84,7 @@ + mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + $(INSTALL_F) $(JULIAHOME)/contrib/julia.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + -touch -c $(DESTDIR)$(datarootdir)/icons/hicolor/ ++ -gtk-update-icon-cache $(DESTDIR)$(datarootdir)/icons/hicolor/ + mkdir -p $(DESTDIR)$(datarootdir)/applications/ + $(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/ + # Install appdata file |