7c2e16a817
Release notes at https://discourse.julialang.org/t/julia-v1-10-5-has-been-released/118720 Also: - reorganize some lines to pet portlint - regenerate the patches - don’t depend on suitesparse-config but on UMFPACK (including CHOLMOD) and SPQR - replace mbedtls2 by mbedtls3 and remove deprecation - allow to upgrade gmp and mpfr from Makefile - fix USE_LDCONFIG - apply the patch from PR 286169 - add a pkg-message about certificate error. PR: 281237 + 286169 Reported by: Hiroo Ono <hiroo.ono+freebsd (at) gmail.com> and Trond Endrestøl <Trond.Endrestol (at) ximalas.info>
53 lines
2.5 KiB
Plaintext
53 lines
2.5 KiB
Plaintext
--- Makefile.orig 2024-08-27 21:19:31 UTC
|
|
+++ Makefile
|
|
@@ -265,13 +265,13 @@ define stringreplace
|
|
# Note that we disable MSYS2's path munging here, as otherwise
|
|
# it replaces our `:`-separated list as a `;`-separated one.
|
|
define stringreplace
|
|
- MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x - '$1' | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)"
|
|
+ MSYS2_ARG_CONV_EXCL='*' $(build_depsbindir)/stringreplace $$(strings -t x -a '$1' | grep "$2" | awk '{print $$1;}') "$3" 255 "$(call cygpath_w,$1)"
|
|
endef
|
|
|
|
|
|
-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
|
|
+install: $(build_depsbindir)/stringreplace
|
|
@$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
|
|
- @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
|
|
+ @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
|
|
mkdir -p $(DESTDIR)$$subdir; \
|
|
done
|
|
|
|
@@ -370,8 +370,6 @@ endif
|
|
cp -R -L $(JULIAHOME)/base/* $(DESTDIR)$(datarootdir)/julia/base
|
|
cp -R -L $(JULIAHOME)/test/* $(DESTDIR)$(datarootdir)/julia/test
|
|
cp -R -L $(build_datarootdir)/julia/* $(DESTDIR)$(datarootdir)/julia
|
|
- # Copy documentation
|
|
- cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
|
|
# Remove various files which should not be installed
|
|
-rm -f $(DESTDIR)$(datarootdir)/julia/base/version_git.sh
|
|
-rm -f $(DESTDIR)$(datarootdir)/julia/test/Makefile
|
|
@@ -466,9 +464,9 @@ ifeq ($(OS),FreeBSD)
|
|
# 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 \
|
|
- $(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN' $$lib; \
|
|
- done
|
|
+ #for lib in $(DESTDIR)$(private_libdir)/libgfortran*$(SHLIB_EXT)*; do \
|
|
+ # $(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN' $$lib; \
|
|
+ #done
|
|
endif
|
|
|
|
mkdir -p $(DESTDIR)$(sysconfdir)
|
|
@@ -477,6 +475,10 @@ endif
|
|
ifeq ($(DARWIN_FRAMEWORK),1)
|
|
$(MAKE) -C $(JULIAHOME)/contrib/mac/framework frameworknoinstall
|
|
endif
|
|
+
|
|
+install-docs: $(BUILDROOT)/doc/_build/html/en/index.html
|
|
+ # Copy documentation
|
|
+ cp -R -L $(BUILDROOT)/doc/_build/html $(DESTDIR)$(docdir)/
|
|
|
|
distclean:
|
|
-rm -fr $(BUILDROOT)/julia-*.tar.gz $(BUILDROOT)/julia*.exe $(BUILDROOT)/julia-$(JULIA_COMMIT)
|