diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-07-16 13:03:57 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-07-16 13:03:57 +0000 |
| commit | 8eb2e237ef2db9063e9f17453e972a4278a3ba8f (patch) | |
| tree | 6f1083340901923620586fd10e916625b6f72880 /lang/julia/files/patch-Makefile | |
| parent | sysutils/dupd: Update to version 1.6 (diff) | |
lang/julia: update to 0.6.4
PR: 229799
Submitted by: Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)
Notes
Notes:
svn path=/head/; revision=474736
Diffstat (limited to 'lang/julia/files/patch-Makefile')
| -rw-r--r-- | lang/julia/files/patch-Makefile | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 1eb6f92e871a..2f6fb3598f50 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2018-05-27 21:19:34 UTC +--- 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 @@ -17,7 +17,7 @@ @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) ifneq ($(CPUID_SPECIFIC_BINARIES), 0) -@@ -333,7 +332,7 @@ define stringreplace +@@ -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 @@ -26,7 +26,7 @@ @$(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; \ -@@ -378,9 +377,6 @@ endif +@@ -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)/ @@ -36,7 +36,7 @@ # Remove perf suite -rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/ # Remove various files which should not be installed -@@ -388,37 +384,43 @@ endif +@@ -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)/ @@ -73,6 +73,20 @@ - $(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)/ + |