Skip to content

Commit

Permalink
Set an RPATH on all libraries requiring fortran in binary-dist (Julia…
Browse files Browse the repository at this point in the history
  • Loading branch information
Keno authored and tkelman committed Aug 10, 2016
1 parent cbb1b96 commit 8615732
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ endif
@$(MAKE) -C $(BUILDROOT) -f $(JULIAHOME)/Makefile install
cp $(JULIAHOME)/LICENSE.md $(BUILDROOT)/julia-$(JULIA_COMMIT)
ifneq ($(OS), WINNT)
-$(JULIAHOME)/contrib/fixup-libgfortran.sh $(DESTDIR)$(private_libdir)
-$(CUSTOM_LD_LIBRARY_PATH) PATH=$(PATH):$(build_depsbindir) $(JULIAHOME)/contrib/fixup-libgfortran.sh $(DESTDIR)$(private_libdir)
endif
ifeq ($(OS), Linux)
-$(JULIAHOME)/contrib/fixup-libstdc++.sh $(DESTDIR)$(libdir) $(DESTDIR)$(private_libdir)
Expand Down
9 changes: 9 additions & 0 deletions contrib/fixup-libgfortran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,12 @@ if [ "$UNAME" = "Darwin" ]; then
done
done
fi

if [ "$UNAME" = "Linux" ]; then
cd $private_libdir
for file in openlibm quadmath gfortran openblas arpack lapack openspecfun; do
for dylib in $(ls lib$file*.so* 2>/dev/null); do
patchelf --set-rpath \$ORIGIN $dylib
done
done
fi

0 comments on commit 8615732

Please sign in to comment.