diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2018-12-28 10:45:16 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2018-12-28 10:45:16 +0000 |
| commit | 5c513cb46879ac108493bd808550f74fd31970de (patch) | |
| tree | e3d0ed5f570ffd9f4e21db78a65de81c4962570c /lang/julia/files/patch-Makefile | |
| parent | update net-mgmt/check_ssl_cert to 1.80.0 (diff) | |
Update to 1.0.3
Changelog: https://github.com/JuliaLang/julia/releases/tag/v1.0.3
PR: 234266
Submitted by: Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)
MFH: 2018Q4
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=488594
Diffstat (limited to 'lang/julia/files/patch-Makefile')
| -rw-r--r-- | lang/julia/files/patch-Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 326d5d9a3ddb..e11bdb8eee7d 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2018-08-02 19:21:47 UTC +--- Makefile.orig 2018-12-18 01:38:57 UTC +++ Makefile -@@ -266,24 +266,6 @@ endif +@@ -264,24 +264,6 @@ endif endif endif @@ -25,9 +25,9 @@ ifeq ($(OS),WINNT) define std_dll julia-deps: | $$(build_bindir)/lib$(1).dll $$(build_depsbindir)/lib$(1).dll -@@ -316,8 +298,7 @@ define stringreplace - $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" - endef +@@ -328,8 +310,7 @@ JL_PRIVATE_LIBS-0 += libgfortran libgcc_s libquadmath + endif + -install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html - @$(MAKE) $(QUIET_MAKE) all @@ -35,7 +35,7 @@ @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ mkdir -p $(DESTDIR)$$subdir; \ done -@@ -359,10 +340,6 @@ endif +@@ -371,10 +352,6 @@ endif fi \ done \ done @@ -46,7 +46,7 @@ endif # Copy public headers -@@ -376,24 +353,11 @@ endif +@@ -389,8 +366,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)/ @@ -55,6 +55,8 @@ # Remove various files which should not be installed -rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile +@@ -400,16 +375,6 @@ endif + -rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked # Copy in beautiful new man page $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ - # Copy icon and .desktop file @@ -67,11 +69,10 @@ - # Install appdata file - mkdir -p $(DESTDIR)$(datarootdir)/appdata/ - $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/ -- + # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel) ifneq ($(private_libdir_rel),$(build_private_libdir_rel)) - ifeq ($(OS), Darwin) -@@ -403,7 +367,7 @@ ifeq ($(OS), Darwin) +@@ -420,7 +385,7 @@ ifeq ($(OS), Darwin) done else ifneq (,$(findstring $(OS),Linux FreeBSD)) for j in $(JL_TARGETS) ; do \ @@ -80,7 +81,7 @@ done endif -@@ -414,22 +378,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) +@@ -431,22 +396,24 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) endif endif @@ -117,5 +118,5 @@ + mkdir -p $(DESTDIR)$(datarootdir)/appdata/ + $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/ - distclean dist-clean: + distclean: -rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT) |