fix make dist on linux; make all installed libraries private

Adds patchelf to deps, to modify shared library rpaths.
Closes JuliaLang#1602.

Make.inc

@@ -9,10 +9,6 @@ USRINC = $(USR)/include
 LLVMROOT = $(USR)
 BUILD = $(USR)
 
-# List of "private" libraries, e.g. ones that get installed to lib/julia
-JL_PRIVATE_LIBS = Rmath openlibm julia-release suitesparse_wrapper tk_wrapper gmp_wrapper glpk_wrapper random
-JL_LIBS = amd arpack cholmod colamd fftw3 fftw3f fftw3_threads fftw3f_threads glpk gmp grisu history $(OPENBLASNAME) pcre readline spqr umfpack z
-
 # Directories where said libraries get installed to
 JL_PRIVATE_LIBDIR = lib/julia
 JL_LIBDIR = lib
@@ -140,7 +136,7 @@ endif
 ifeq ($(USE_SYSTEM_LIBUNWIND), 1)
 LIBUNWIND=-lunwind-generic -lunwind
 else
-LIBUNWIND=$(USR)/$(JL_LIBDIR)/libunwind-generic.a $(USR)/$(JL_LIBDIR)/libunwind.a
+LIBUNWIND=$(USR)/lib/libunwind-generic.a $(USR)/lib/libunwind.a
 endif
 
 ifeq ($(USE_SYSTEM_LLVM), 1)
@@ -152,13 +148,13 @@ endif
 ifeq ($(USE_SYSTEM_READLINE), 1)
 READLINE = -lreadline 
 else
-READLINE = $(USR)/$(JL_LIBDIR)/libreadline.a
+READLINE = $(USR)/lib/libreadline.a
 endif
 
 ifneq ($(OS),WINNT)
 READLINE += -lncurses
 else
-READLINE += $(USR)/$(JL_LIBDIR)/libhistory.a
+READLINE += $(USR)/lib/libhistory.a
 endif
 
 ifeq ($(USE_SYSTEM_PCRE), 1)
@@ -177,10 +173,10 @@ LIBBLASNAME = libblas
 endif
 else
 ifeq ($(OS), WINNT)
-LIBBLAS = $(USR)/$(JL_LIBDIR)/libopenblas-r0.2.2.$(SHLIB_EXT) #necessary due to some stupid Windows behavoir - will try yto fix soon
+LIBBLAS = $(USR)/lib/libopenblas-r0.2.2.$(SHLIB_EXT) #necessary due to some stupid Windows behavoir - will try yto fix soon
 LIBBLASNAME = libopenblas-r0.2.2
 else
-LIBBLAS = -L$(USR)/$(JL_LIBDIR) -lopenblas
+LIBBLAS = -L$(USR)/lib -lopenblas
 LIBBLASNAME = libopenblas
 endif
 endif
@@ -200,59 +196,67 @@ endif
 
 # OS specific stuff
 
-# must end with a / and have no trailing spaces
-INSTALL_NAME_ID_DIR = @rpath/
+# install_name_tool
+ifeq ($(OS), Darwin)
+ # must end with a / and have no trailing spaces
+ INSTALL_NAME_ID_DIR = @rpath/
+ INSTALL_NAME_CMD = install_name_tool -id $(INSTALL_NAME_ID_DIR)
+ INSTALL_NAME_CHANGE_CMD = install_name_tool -change
+else
+ INSTALL_NAME_ID_DIR =
+ INSTALL_NAME_CMD = true -ignore 
+ INSTALL_NAME_CHANGE_CMD = true -ignore 
+endif
 
-RPATH = 
-RPATH_ORIGIN = 
+# shared library runtime paths
+ifeq ($(OS), WINNT)
+ RPATH =
+ RPATH_ORIGIN =
+else ifeq ($(OS), Darwin)
+ RPATH = -Wl,-rpath,'@executable_path/../$(JL_PRIVATE_LIBDIR)' -Wl,-rpath,'@executable_path/../$(JL_LIBDIR)'
+ RPATH_ORIGIN =
+else
+ RPATH = -Wl,-rpath,'$$ORIGIN/../$(JL_PRIVATE_LIBDIR)' -Wl,-rpath,'$$ORIGIN/../$(JL_LIBDIR)' -Wl,-z,origin
+ RPATH_ORIGIN = -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
+endif
 
+# file extensions
 ifeq ($(OS), WINNT)
-SHELL_EXT = bat
+ SHLIB_EXT = dll
+ SHELL_EXT = bat
+else ifeq ($(OS), Darwin)
+ SHLIB_EXT = dylib
+ SHELL_EXT = sh
+else
+ SHLIB_EXT = so
+ SHELL_EXT = sh
+endif
+
+# --whole-archive
+ifeq ($(OS), Darwin)
+ WHOLE_ARCHIVE = -Xlinker -all_load
+ NO_WHOLE_ARCHIVE =
 else
-SHELL_EXT = sh
+ WHOLE_ARCHIVE = -Wl,--whole-archive
+ NO_WHOLE_ARCHIVE = -Wl,--no-whole-archive
 endif
 
 ifeq ($(OS), Linux)
-INSTALL_NAME_CMD = true -ignore
-INSTALL_NAME_CHANGE_CMD = true -ignore
-SHLIB_EXT = so
-RPATH = -Wl,-rpath,'$$ORIGIN/../$(JL_LIBDIR)' -Wl,-rpath,'$$ORIGIN/../$(JL_PRIVATE_LIBDIR)'
-RPATH_ORIGIN = -Wl,-rpath,'$$ORIGIN'
 OSLIBS += -ldl -lrt -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
-WHOLE_ARCHIVE = -Wl,--whole-archive
-NO_WHOLE_ARCHIVE = -Wl,--no-whole-archive
 JLDFLAGS = -Wl,-Bdynamic
 endif
 
 ifeq ($(OS), FreeBSD)
-INSTALL_NAME_CMD = true -ignore
-INSTALL_NAME_CHANGE_CMD = true -ignore
-SHLIB_EXT = so
-RPATH = -Wl,-rpath,'$$ORIGIN/../$(JL_LIBDIR)' -Wl,-rpath,'$$ORIGIN/../$(JL_PRIVATE_LIBDIR)' -Wl,-z,origin
-RPATH_ORIGIN = -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
-WHOLE_ARCHIVE = -Wl,--whole-archive
-NO_WHOLE_ARCHIVE = -Wl,--no-whole-archive
 JLDFLAGS = -Wl,-Bdynamic
 OSLIBS += -lkvm -lrt -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap $(NO_WHOLE_ARCHIVE) $(LIBUNWIND)
 endif
 
 ifeq ($(OS), Darwin)
-INSTALL_NAME_CMD = install_name_tool -id $(INSTALL_NAME_ID_DIR)
-INSTALL_NAME_CHANGE_CMD = install_name_tool -change
-RPATH = -Wl,-rpath,'@executable_path/../$(JL_LIBDIR)' -Wl,-rpath,'@executable_path/../$(JL_PRIVATE_LIBDIR)'
-SHLIB_EXT = dylib
 OSLIBS += -ldl -Wl,-w -framework ApplicationServices
-WHOLE_ARCHIVE = -Xlinker -all_load
-NO_WHOLE_ARCHIVE =
 JLDFLAGS =
 endif
 
 ifeq ($(OS), WINNT)
-INSTALL_NAME_CMD = true -ignore
-INSTALL_NAME_CHANGE_CMD = true -ignore
-SHLIB_EXT = dll
-WHOLE_ARCHIVE = -Wl,--whole-archive
-NO_WHOLE_ARCHIVE = -Wl,--no-whole-archive
 OSLIBS += -Wl,--export-all-symbols -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -lpthread $(NO_WHOLE_ARCHIVE) -lPsapi -lkernel32 -lWs2_32 -lIphlpapi
 endif
 

Makefile

@@ -35,11 +35,20 @@ $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji: VERSION base/*.jl $(BUILD)/share/julia/hel
  $(QUIET_JULIA) cd base && \
  (test -f $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji || $(JULIA_EXECUTABLE) -bf sysimg.jl) && $(JULIA_EXECUTABLE) -f sysimg.jl || echo "Note: this error is usually fixed by running 'make cleanall'."
 
+# public libraries, that are installed in $(PREFIX)/lib
+JL_LIBS = julia-release julia-debug
+
+# private libraries, that are installed in $(PREFIX)/lib/julia
+JL_PRIVATE_LIBS = amd arpack cholmod colamd fftw3 fftw3f fftw3_threads \
+ fftw3f_threads glpk glpk_wrapper gmp gmp_wrapper grisu \
+ history openlibm pcre random readline Rmath spqr \
+ suitesparse_wrapper tk_wrapper umfpack z
 ifeq ($(OS), WINNT)
-OPENBLASNAME=openblas-r0.1.1
+ JL_PRIVATE_LIBS += openblas-r0.1.1
 else
-OPENBLASNAME=openblas
+ JL_PRIVATE_LIBS += openblas
 endif
+
 PREFIX ?= julia-$(JULIA_COMMIT)
 install: release
  @$(MAKEs) -C test/unicode
@@ -49,10 +58,10 @@ install: release
  cp $(BUILD)/bin/*julia* $(PREFIX)/bin
  cd $(PREFIX)/bin && ln -s julia-release-$(DEFAULT_REPL) julia
  -for suffix in $(JL_LIBS) ; do \
- cp $(BUILD)/$(JL_LIBDIR)/lib$${suffix}.$(SHLIB_EXT) $(PREFIX)/$(JL_LIBDIR) ; \
+ cp -a $(BUILD)/lib/lib$${suffix}.* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
  done
  -for suffix in $(JL_PRIVATE_LIBS) ; do \
- cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/lib$${suffix}.$(SHLIB_EXT) $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
+ cp -a $(BUILD)/lib/lib$${suffix}.* $(PREFIX)/$(JL_PRIVATE_LIBDIR) ; \
  done
  # Copy system image
  cp $(BUILD)/$(JL_PRIVATE_LIBDIR)/sys.ji $(PREFIX)/$(JL_PRIVATE_LIBDIR)
@@ -77,12 +86,6 @@ endif
  tar zcvf julia-$(JULIA_COMMIT)-$(OS)-$(ARCH).tar.gz julia-$(JULIA_COMMIT)
  rm -fr julia-$(JULIA_COMMIT)
 
-deb:
- fakeroot debian/rules binary
-
-debclean:
- fakeroot debian/rules clean
-
 h2j: $(BUILD)/$(JL_LIBDIR)/libLLVM*.a $(BUILD)/$(JL_LIBDIR)/libclang*.a src/h2j.cpp
  $(QUIET_CC) g++ -O2 -fno-rtti -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -Iinclude $^ -o $@
 

deps/.gitignore

@@ -13,6 +13,7 @@
 /lighttpd-*
 /llvm-*
 /openblas-*
+/patchelf-*
 /pcre-*
 /readline-*
 /readline62-*