Attachment #195168 for bug #229799

View | Details | Raw Unified | Return to bug 229799
Collapse All | Expand All

Lines 2-10 Link Here

(-)b/lang/julia/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= julia	4	PORTNAME= julia
5	PORTVERSION= 0.6.3	5	PORTVERSION= 0.6.4
6	DISTVERSIONSUFFIX= -full	6	DISTVERSIONSUFFIX= -full
7	PORTREVISION= 1
8	CATEGORIES= lang math	7	CATEGORIES= lang math
9	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/	8	MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
10		9

Lines 1-3 Link Here

(-)b/lang/julia/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1528732844	1	TIMESTAMP = 1531703695
2	SHA256 (julia-0.6.3-full.tar.gz) = 2b5b0d84e49ca88fdec6d54a64eba4ce77f5c5cb8f34d307f3ba0ec04a89913a	2	SHA256 (julia-0.6.4-full.tar.gz) = 2b2f5543ad4206eb40c7b850cdfc5a812c6df0b2b5bcf6a3206c0e446d988f1b
3	SIZE (julia-0.6.3-full.tar.gz) = 90879414	3	SIZE (julia-0.6.4-full.tar.gz) = 90983649




--- Makefile.orig	2018-07-09 19:17:10 UTC
+++ Makefile
@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/exa
 	@mkdir -p $(build_docdir)/examples

 	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
 
 ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
@@ -351,7 +350,7 @@ define stringreplace
 	$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
 endef
 

 	@$(MAKE) $(QUIET_MAKE) all
 	@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
 		mkdir -p $(DESTDIR)$$subdir; \
@@ -396,9 +395,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)/

 	# Remove perf suite
 	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
 	# Remove various files which should not be installed
@@ -406,51 +402,43 @@ endif
 	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
 	# Copy in beautiful new man page
 	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/

-	$(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
 endif
 
-	# On FreeBSD, remove the build's libdir from each library's RPATH
-ifeq ($(OS),FreeBSD)
-	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(libdir) $(build_libdir)
-	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(private_libdir) $(build_libdir)
-	$(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(bindir) $(build_libdir)
-	# Set libgfortran's RPATH to ORIGIN instead of GCCPATH. It's only libgfortran that
-	# 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.
-	for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
-		$(build_depsbindir)/patchelf --set-rpath '$$ORIGIN' $$lib; \
-	done
-endif
-
 	mkdir -p $(DESTDIR)$(sysconfdir)
 	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
+

Return to bug 229799

Lines 1-4 Link Here

(-)b/lang/julia/files/patch-Makefile (-4 / +18 lines)
1	--- Makefile.orig 2018-05-27 21:19:34 UTC	1	--- Makefile.orig 2018-07-09 19:17:10 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/exa	3	@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/exa
4	@mkdir -p $(build_docdir)/examples	4	@mkdir -p $(build_docdir)/examples
Lines 17-23 Link Here
17	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)	17	@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
18		18
19	ifneq ($(CPUID_SPECIFIC_BINARIES), 0)	19	ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
20	@@ -333,7 +332,7 @@ define stringreplace	20	@@ -351,7 +350,7 @@ define stringreplace
21	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"	21	$(build_depsbindir)/stringreplace $$(strings -t x - $1 \| grep '$2' \| awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
22	endef	22	endef
23		23
Lines 26-32 Link Here
26	@$(MAKE) $(QUIET_MAKE) all	26	@$(MAKE) $(QUIET_MAKE) all
27	@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \	27	@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
28	mkdir -p $(DESTDIR)$$subdir; \	28	mkdir -p $(DESTDIR)$$subdir; \
29	@@ -378,9 +377,6 @@ endif	29	@@ -396,9 +395,6 @@ endif
30	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/	30	$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
31	# Copy in all .jl sources as well	31	# Copy in all .jl sources as well
32	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/	32	cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
Lines 36-42 Link Here
36	# Remove perf suite	36	# Remove perf suite
37	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/	37	-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
38	# Remove various files which should not be installed	38	# Remove various files which should not be installed
39	@@ -388,37 +384,43 @@ endif	39	@@ -406,51 +402,43 @@ endif
40	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile	40	-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
41	# Copy in beautiful new man page	41	# Copy in beautiful new man page
42	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/	42	$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
Lines 73-78 Link Here
73	- $(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))	73	- $(call stringreplace,$(DESTDIR)$(libdir)/libjulia-debug.$(SHLIB_EXT),sys-debug.$(SHLIB_EXT)$$,$(private_libdir_rel)/sys-debug.$(SHLIB_EXT))
74	endif	74	endif
75		75
		76	- # On FreeBSD, remove the build's libdir from each library's RPATH
		77	-ifeq ($(OS),FreeBSD)
		78	- $(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(libdir) $(build_libdir)
		79	- $(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(private_libdir) $(build_libdir)
		80	- $(JULIAHOME)/contrib/fixup-rpath.sh $(build_depsbindir)/patchelf $(DESTDIR)$(bindir) $(build_libdir)
		81	- # Set libgfortran's RPATH to ORIGIN instead of GCCPATH. It's only libgfortran that
		82	- # needs to be fixed here, as libgcc_s and libquadmath don't have RPATHs set. If we
		83	- # don't set libgfortran's RPATH, it won't be able to find its friends on systems
		84	- # that don't have the exact GCC port installed used for the build.
		85	- for lib in $(DESTDIR)$(private_libdir)/libgfortran$(SHLIB_EXT); do \
		86	- $(build_depsbindir)/patchelf --set-rpath '$$ORIGIN' $$lib; \
		87	- done
		88	-endif
		89	-
76	mkdir -p $(DESTDIR)$(sysconfdir)	90	mkdir -p $(DESTDIR)$(sysconfdir)
77	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/	91	cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
78	+	92	+