Attachment 200356 Details for Bug 234266 – julia v1.0.3 patch

[patch] julia v1.0.3 patch

julia.patch (text/plain), 5.44 KB, created by Iblis Lin on 2018-12-22 11:02:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Iblis Lin

Created: 2018-12-22 11:02:45 UTC

Size: 5.44 KB

patch

obsolete

>diff --git a/lang/julia/Makefile b/lang/julia/Makefile
>index c5fe8009db52..3f12c0c7bf08 100644
>--- a/lang/julia/Makefile
>+++ b/lang/julia/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	julia
>-PORTVERSION=	1.0.2
>-PORTREVISION=	1
>+PORTVERSION=	1.0.3
> DISTVERSIONSUFFIX=	-full
> CATEGORIES=	lang math
> MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
>@@ -32,7 +31,7 @@ BUILD_DEPENDS=	patchelf:sysutils/patchelf \
> USES=		gmake compiler:c++11-lib fortran python:2.7,build perl5
> USE_LDCONFIG=	yes
> 
>-WRKSRC=	${WRKDIR}/${PORTNAME}
>+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> ALL_TARGET=	default
> INSTALL_TARGET=	install
>diff --git a/lang/julia/distinfo b/lang/julia/distinfo
>index 2fbd34121486..0c2c42998900 100644
>--- a/lang/julia/distinfo
>+++ b/lang/julia/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1541862400
>-SHA256 (julia-1.0.2-full.tar.gz) = 74c850516b293029fcefb1114145c424cab64e1d2f87264350d88a237f5f8bc5
>-SIZE (julia-1.0.2-full.tar.gz) = 95704004
>+TIMESTAMP = 1545107140
>+SHA256 (julia-1.0.3-full.tar.gz) = 618e6d29f1fba00f5b2bebf14e69a3a536c27c3132e021cf39774e8500dd29fa
>+SIZE (julia-1.0.3-full.tar.gz) = 95732731
>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)
>diff --git a/lang/julia/files/patch-stdlib_Makefile b/lang/julia/files/patch-stdlib_Makefile
>index d7f34967fc29..9ab229c7b6e6 100644
>--- a/lang/julia/files/patch-stdlib_Makefile
>+++ b/lang/julia/files/patch-stdlib_Makefile
>@@ -1,15 +1,19 @@
>---- stdlib/Makefile.orig	2018-11-08 20:15:38 UTC
>+--- stdlib/Makefile.orig	2018-12-16 21:26:52 UTC
> +++ stdlib/Makefile
>-@@ -21,6 +21,12 @@ $(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR)))
>- extract-pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
>- Pkg: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
>- 	rm -rf $@
>+@@ -25,8 +25,15 @@ PKG_GIT_URL := git://github.com/JuliaLang/Pkg.jl.git
>+ PKG_TAR_URL = https://api.github.com/repos/JuliaLang/Pkg.jl/tarball/$1
>+ $(eval $(call git-external,Pkg,PKG,,,$(BUILDDIR)))
>+ $(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled: $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
>+-	@# no build steps
>++	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.gitignore
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.codecov.yml
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/.travis.yml
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/appveyor.yml
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/.travis.yml
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/ext/TOML/appveyor.yml
> +	rm $(BUILDDIR)/$(PKG_SRC_DIR)/source-extracted
>- 	cp -r $(BUILDDIR)/$(PKG_SRC_DIR) $@
>- get-pkg: Pkg
>- clean-pkg:
>+ 	echo 1 > $@
>++
>+ $(eval $(call symlink_install,Pkg,$$(PKG_SRC_DIR),$$(build_datarootdir)/julia/stdlib/$$(VERSDIR)))
>+ clean-Pkg:
>+ 	-rm $(BUILDDIR)/$(PKG_SRC_DIR)/build-compiled

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 234266: 200356