More fixes for FreeBSD and building from source

JuliaLang · Apr 28, 2020 · cb84f0c · cb84f0c
1 parent 9acfa2f
commit cb84f0c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Make.inc b/Make.inc
@@ -371,7 +371,7 @@ define lowercase
 $(shell echo $1 | tr A-Z a-z)
 endef
 define shell_escape
-$(subst \,\\,$(subst $$,$$$$,$(1)))
+$(subst $$,\$$\$$,$(subst \,\\,$(1)))
 endef
 
 # Figure out OS and architecture

diff --git a/Makefile b/Makefile
@@ -171,7 +171,7 @@ endef
 $(eval $(call register_private_lib,,libccalltest libllvmcalltest))
 ifeq ($(USE_GPL_LIBS), 1)
 $(eval $(call register_private_lib,,libsuitesparse_wrapper))
-$(eval $(call register_private_lib,SUITESPARSE,libamd libcamd libccolamd libcholmod libcolamd libumfpack libspqr libsuitesparseconfig))
+$(eval $(call register_private_lib,SUITESPARSE,libamd libbtf libcamd libccolamd libcholmod libcolamd libklu libumfpack librbio libspqr libsuitesparseconfig))
 endif
 $(eval $(call register_private_lib,PCRE,libpcre2-8))
 $(eval $(call register_private_lib,DSFMT,libdSFMT))
@@ -296,7 +296,7 @@ endif
 	mkdir -p $(DESTDIR)$(datarootdir)/julia/base $(DESTDIR)$(datarootdir)/julia/test
 	cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
 	cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
-	cp -Ra $(build_datarootdir)/julia/artifacts $(DESTDIR)$(datarootdir)/julia
+	-cp -Ra $(build_datarootdir)/julia/artifacts $(DESTDIR)$(datarootdir)/julia
 	# Copy everything except artifacts, collapsing symlinks
 	for f in $(build_datarootdir)/julia/*; do \
 		if [ $$(basename $${f}) != artifacts ]; then \

diff --git a/deps/blas.mk b/deps/blas.mk
@@ -80,8 +80,8 @@ endif
 endif
 
 OPENBLAS_BUILD_OPTS += CFLAGS="$(CFLAGS) $(OPENBLAS_CFLAGS)"
-OPENBLAS_BUILD_OPTS += FFLAGS="$(FFLAGS) $(OPENBLAS_FFLAGS) -L$(CSL_SHLIBDIR)"
-OPENBLAS_BUILD_OPTS += LDFLAGS="$(LDFLAGS) $(RPATH_ESCAPED_ORIGIN) -L$(CSL_SHLIBDIR)"
+OPENBLAS_BUILD_OPTS += FFLAGS="$(FFLAGS) $(OPENBLAS_FFLAGS) -L$(CSL_SHLIBDIR) $(call shell_escape,$(call rpath_flag,$(CSL_SHLIBDIR)))"
+OPENBLAS_BUILD_OPTS += LDFLAGS="$(LDFLAGS) $(RPATH_ESCAPED_ORIGIN) -L$(CSL_SHLIBDIR) $(call shell_escape,$(call rpath_flag,$(CSL_SHLIBDIR)))"
 
 # Debug OpenBLAS
 ifeq ($(OPENBLAS_DEBUG), 1)

diff --git a/deps/csl.mk b/deps/csl.mk
@@ -10,6 +10,7 @@ ifeq ($(OS),FreeBSD)
 UNINSTALL_compilersupportlibraries := delete-uninstaller $(build_shlibdir)/libgcc_s.so.1
 $(build_prefix)/manifest/compilersupportlibraries: | $(build_shlibdir) $(build_prefix)/manifest
 	@cp -v $$($(FC) --print-file-name=libgcc_s.so.1) $(build_shlibdir)
+	@ln -s libgcc_s.so.1 $(build_shlibdir)/libgcc_s.so
 	@echo "delete-uninstaller $(build_shlibdir)/libgcc_s.so.1" > "$@"
 else
 $(build_prefix)/manifest/compilersupportlibraries:

diff --git a/deps/libuv.mk b/deps/libuv.mk
@@ -64,7 +64,8 @@ fastcheck-libuv: #none
 check-libuv: $(LIBUV_BUILDDIR)/build-checked
 
 # If we built our own libuv, we need to generate a fake LibUV_jll package to load it in:
-$(eval $(call jll-generate,LibUV_jll,libuv=\"libuv\",,183b4373-6708-53ba-ad28-60e28bb38547,))
+# Note that since we only build the static library above, we don't bother to generate any library products here.
+$(eval $(call jll-generate,LibUV_jll,,,183b4373-6708-53ba-ad28-60e28bb38547,))
 
 else # USE_BINARYBUILDER_LIBUV