sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

lang/julia: fix RUNPATH in 0.6.3

Browse source 
PR:		228993
Submitted by:	Iblis Lin <iblis@hs.ntnu.edu.tw> (maintainer)
This commit is contained in:
Steve Wills 2018-06-14 23:40:46 +00:00
parent bd2f6e26ca
commit 9ee604d56e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472417
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lang/julia/Makefile
View file

@ -4,6 +4,7 @@
PORTNAME= julia PORTNAME= julia
PORTVERSION= 0.6.3 PORTVERSION= 0.6.3
DISTVERSIONSUFFIX= -full DISTVERSIONSUFFIX= -full
PORTREVISION= 1
CATEGORIES= lang math CATEGORIES= lang math
MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/

12
lang/julia/files/patch-Make.inc
View file

@ -1,6 +1,6 @@
--- Make.inc.orig 2017-06-19 17:48:45 UTC --- Make.inc.orig 2018-05-27 21:19:34 UTC
+++ Make.inc +++ Make.inc
@@ -133,12 +133,7 @@ endif @@ -134,12 +134,7 @@ endif
# disable automatic Makefile rules # disable automatic Makefile rules
.SUFFIXES: .SUFFIXES:
@ -13,7 +13,7 @@
# Julia's Semantic Versioning system labels the three decimal places in a version number as # Julia's Semantic Versioning system labels the three decimal places in a version number as
# the major, minor and patch versions. Typically the major version would be incremented # the major, minor and patch versions. Typically the major version would be incremented
@@ -183,7 +178,7 @@ libdir := $(prefix)/lib @@ -184,7 +179,7 @@ libdir := $(prefix)/lib
libexecdir := $(prefix)/libexec libexecdir := $(prefix)/libexec
datarootdir := $(prefix)/share datarootdir := $(prefix)/share
docdir := $(datarootdir)/doc/julia docdir := $(datarootdir)/doc/julia
@ -22,7 +22,7 @@
man1dir := $(mandir)/man1 man1dir := $(mandir)/man1
includedir := $(prefix)/include includedir := $(prefix)/include
sysconfdir := $(prefix)/etc sysconfdir := $(prefix)/etc
@@ -197,7 +192,7 @@ build_libdir := $(build_prefix)/lib @@ -198,7 +193,7 @@ build_libdir := $(build_prefix)/lib
build_libexecdir := $(build_prefix)/libexec build_libexecdir := $(build_prefix)/libexec
build_datarootdir := $(build_prefix)/share build_datarootdir := $(build_prefix)/share
build_docdir := $(build_datarootdir)/doc/julia build_docdir := $(build_datarootdir)/doc/julia
@ -31,7 +31,7 @@
build_man1dir := $(build_mandir)/man1 build_man1dir := $(build_mandir)/man1
build_includedir := $(build_prefix)/include build_includedir := $(build_prefix)/include
build_sysconfdir := $(build_prefix)/etc build_sysconfdir := $(build_prefix)/etc
@@ -350,7 +345,7 @@ endif @@ -351,7 +346,7 @@ endif
ifeq ($(USEIFC), 1) ifeq ($(USEIFC), 1)
FC := ifort FC := ifort
else else
@ -40,7 +40,7 @@
endif endif
STDLIBCPP_FLAG := STDLIBCPP_FLAG :=
@@ -403,14 +398,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions @@ -404,14 +399,14 @@ SHIPFLAGS := -O3 -ggdb2 -falign-functions
endif endif
ifeq ($(USECLANG),1) ifeq ($(USECLANG),1)

20
lang/julia/files/patch-Makefile
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2017-06-19 17:48:45 UTC --- Makefile.orig 2018-05-27 21:19:34 UTC
+++ Makefile +++ Makefile
@@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $( @@ -71,7 +71,6 @@ $(build_prefix)/.examples: $(wildcard $(JULIAHOME)/exa
@mkdir -p $(build_docdir)/examples @mkdir -p $(build_docdir)/examples
@cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/ @cp -R $(JULIAHOME)/examples/*.jl $(build_docdir)/examples/
@cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/ @cp -R $(JULIAHOME)/examples/clustermanager $(build_docdir)/examples/
@ -8,7 +8,7 @@
@echo 1 > $@ @echo 1 > $@
julia-symlink: julia-ui-$(JULIA_BUILD_MODE) julia-symlink: julia-ui-$(JULIA_BUILD_MODE)
@@ -96,7 +95,7 @@ julia-src-release julia-src-debug : juli @@ -96,7 +95,7 @@ julia-src-release julia-src-debug : julia-src-% : juli
julia-ui-release julia-ui-debug : julia-ui-% : julia-src-% julia-ui-release julia-ui-debug : julia-ui-% : julia-src-%
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$* @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/ui julia-$*
@ -17,7 +17,7 @@
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE) @$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT) $(build_private_libdir)/inference.ji JULIA_BUILD_MODE=$(JULIA_BUILD_MODE)
ifneq ($(CPUID_SPECIFIC_BINARIES), 0) ifneq ($(CPUID_SPECIFIC_BINARIES), 0)
@@ -332,7 +331,7 @@ define stringreplace @@ -333,7 +332,7 @@ define stringreplace
$(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)" $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' | awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
endef endef
@ -26,7 +26,7 @@
@$(MAKE) $(QUIET_MAKE) all @$(MAKE) $(QUIET_MAKE) all
@for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ @for subdir in $(bindir) $(datarootdir)/julia/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \
mkdir -p $(DESTDIR)$$subdir; \ mkdir -p $(DESTDIR)$$subdir; \
@@ -377,9 +376,6 @@ endif @@ -378,9 +377,6 @@ endif
$(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/ $(INSTALL_M) $(JULIAHOME)/contrib/build_sysimg.jl $(DESTDIR)$(datarootdir)/julia/
# Copy in all .jl sources as well # Copy in all .jl sources as well
cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/ cp -R -L $(build_datarootdir)/julia $(DESTDIR)$(datarootdir)/
@ -36,7 +36,7 @@
# Remove perf suite # Remove perf suite
-rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/ -rm -rf $(DESTDIR)$(datarootdir)/julia/test/perf/
# Remove various files which should not be installed # Remove various files which should not be installed
@@ -387,38 +383,44 @@ endif @@ -388,37 +384,43 @@ endif
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile -rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
# Copy in beautiful new man page # Copy in beautiful new man page
$(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/
@ -63,7 +63,8 @@
-else ifneq (,$(findstring $(OS),Linux FreeBSD)) -else ifneq (,$(findstring $(OS),Linux FreeBSD))
+else +else
for julia in $(DESTDIR)$(bindir)/julia* ; do \ for julia in $(DESTDIR)$(bindir)/julia* ; do \
patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \ - patchelf --set-rpath '$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
+ patchelf --set-rpath '$(GCCPATH):$$ORIGIN/$(private_libdir_rel):$$ORIGIN/$(libdir_rel)' $$julia; \
done done
endif endif
- -
@ -74,7 +75,7 @@
mkdir -p $(DESTDIR)$(sysconfdir) mkdir -p $(DESTDIR)$(sysconfdir)
cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/ cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/
+
+install-docs: +install-docs:
+ # Copy documentation + # Copy documentation
+ cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/ + cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
@ -94,7 +95,6 @@
+ # Install appdata file + # Install appdata file
+ mkdir -p $(DESTDIR)$(datarootdir)/appdata/ + mkdir -p $(DESTDIR)$(datarootdir)/appdata/
+ $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/ + $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
+
distclean dist-clean: distclean dist-clean:
-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT) -rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-*.7z $(BUILDROOT)/julia-$(JULIA_COMMIT)

4
lang/julia/files/patch-src_Makefile
View file

@ -1,4 +1,4 @@
--- src/Makefile.orig 2017-06-19 17:48:45 UTC --- src/Makefile.orig 2018-05-07 22:05:07 UTC
+++ src/Makefile +++ src/Makefile
@@ -263,7 +263,7 @@ else @@ -263,7 +263,7 @@ else
endif endif
@ -9,7 +9,7 @@
$(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@ $(INSTALL_NAME_CMD)libjulia-debug.$(SHLIB_EXT) $@
ifneq ($(OS), WINNT) ifneq ($(OS), WINNT)
@ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT) @ln -sf libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_SHLIB_EXT)
@@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/ @@ -278,7 +278,7 @@ $(BUILDDIR)/libjulia-debug.a: $(SRCDIR)/julia.expmap $
libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS) libjulia-debug: $(build_shlibdir)/libjulia-debug.$(JL_MAJOR_MINOR_SHLIB_EXT) $(PUBLIC_HEADER_TARGETS)
$(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV) $(build_shlibdir)/libjulia.$(JL_MAJOR_MINOR_SHLIB_EXT): $(SRCDIR)/julia.expmap $(OBJS) $(BUILDDIR)/flisp/libflisp.a $(BUILDDIR)/support/libsupport.a $(LIBUV)