Changeset View
Changeset View
Standalone View
Standalone View
lang/julia/files/patch-Makefile
- This file was added.
| --- Makefile.orig 2021-11-15 17:12:50 UTC | |||||
| +++ Makefile | |||||
| @@ -226,13 +226,13 @@ define stringreplace | |||||
| endef | |||||
| -install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html | |||||
| +install: $(build_depsbindir)/stringreplace | |||||
| ifeq ($(BUNDLE_DEBUG_LIBS),1) | |||||
| @$(MAKE) $(QUIET_MAKE) all | |||||
| else | |||||
| @$(MAKE) $(QUIET_MAKE) release | |||||
| endif | |||||
| - @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \ | |||||
| + @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ | |||||
| mkdir -p $(DESTDIR)$$subdir; \ | |||||
| done | |||||
| @@ -298,8 +298,6 @@ endif | |||||
| done \ | |||||
| done | |||||
| endif | |||||
| - # Install `7z` into libexec/ | |||||
| - $(INSTALL_M) $(build_bindir)/7z$(EXE) $(DESTDIR)$(libexecdir)/ | |||||
| # Copy public headers | |||||
| cp -R -L $(build_includedir)/julia/* $(DESTDIR)$(includedir)/julia | |||||
| @@ -314,8 +312,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 | |||||
| @@ -325,12 +321,6 @@ endif | |||||
| -rm -f $(DESTDIR)$(datarootdir)/julia/stdlib/$(VERSDIR)/*/build-checked | |||||
| # Copy in beautiful new man page | |||||
| $(INSTALL_F) $(build_man1dir)/julia.1 $(DESTDIR)$(man1dir)/ | |||||
| - # Copy .desktop file | |||||
| - mkdir -p $(DESTDIR)$(datarootdir)/applications/ | |||||
| - $(INSTALL_F) $(JULIAHOME)/contrib/julia.desktop $(DESTDIR)$(datarootdir)/applications/ | |||||
| - # Install appdata file | |||||
| - mkdir -p $(DESTDIR)$(datarootdir)/appdata/ | |||||
| - $(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/ | |||||
| # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel) | |||||
| ifneq ($(private_libdir_rel),$(build_private_libdir_rel)) | |||||
| @@ -384,26 +374,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) | |||||
| endif | |||||
| endif | |||||
| - # On FreeBSD, remove the build's libdir from each library's RPATH | |||||
| -ifeq ($(OS),FreeBSD) | |||||
| - $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(libdir) $(build_libdir) | |||||
| - $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(private_libdir) $(build_libdir) | |||||
| - $(JULIAHOME)/contrib/fixup-rpath.sh "$(PATCHELF)" $(DESTDIR)$(bindir) $(build_libdir) | |||||
| - # Set libgfortran's RPATH to ORIGIN instead of GCCPATH. It's only libgfortran that | |||||
| - # 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) --set-rpath '$$ORIGIN' $$lib; \ | |||||
| - done | |||||
| -endif | |||||
| - | |||||
| mkdir -p $(DESTDIR)$(sysconfdir) | |||||
| cp -R $(build_sysconfdir)/julia $(DESTDIR)$(sysconfdir)/ | |||||
| ifeq ($(DARWIN_FRAMEWORK),1) | |||||
| $(MAKE) -C $(JULIAHOME)/contrib/mac/framework frameworknoinstall | |||||
| endif | |||||
| +install-docs: | |||||
| + #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) | |||||