diff options
| author |   Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2022-11-16 18:42:09 +0100 |
|---|---|---|
| committer |   Matthew Smith <matthew@gentoo.org> | 2022-11-16 18:04:15 +0000 |
| commit | 7ee2e438446594db98a2cecb48f0cd35ff66512a (patch) | |
| tree | 8372349fd350b56d69f3c01a2eee97ea02e41dca /dev-lang | |
| parent | xfce-extra/xfce4-places-plugin: Bump to 1.8.3 (diff) | |
| download | gentoo-7ee2e438446594db98a2cecb48f0cd35ff66512a.tar.gz gentoo-7ee2e438446594db98a2cecb48f0cd35ff66512a.tar.bz2 gentoo-7ee2e438446594db98a2cecb48f0cd35ff66512a.zip | |
dev-lang/elixir: Fix build with make 4.4 and later
Closes: https://bugs.gentoo.org/show_bug.cgi?id=870016
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Closes: https://github.com/gentoo/gentoo/pull/28296
Signed-off-by: Matthew Smith <matthew@gentoo.org>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/elixir/elixir-1.12.3.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.13.3.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.13.4.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.14.0.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/elixir/files/elixir-1.14.1-make44-parallel-build.patch | 27 |
5 files changed, 31 insertions, 0 deletions
diff --git a/dev-lang/elixir/elixir-1.12.3.ebuild b/dev-lang/elixir/elixir-1.12.3.ebuild index 126b4810b36b..d42a3cbac8b6 100644 --- a/dev-lang/elixir/elixir-1.12.3.ebuild +++ b/dev-lang/elixir/elixir-1.12.3.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10.3-no-Q.patch "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch "${FILESDIR}"/${PN}-1.11.4-fix-elixir-test.patch + "${FILESDIR}"/${PN}-1.14.1-make44-parallel-build.patch ) src_install() { diff --git a/dev-lang/elixir/elixir-1.13.3.ebuild b/dev-lang/elixir/elixir-1.13.3.ebuild index 8379162f7b0d..02bca9b5f8a0 100644 --- a/dev-lang/elixir/elixir-1.13.3.ebuild +++ b/dev-lang/elixir/elixir-1.13.3.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch "${FILESDIR}"/${PN}-1.10.3-no-Q.patch "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch + "${FILESDIR}"/${PN}-1.14.1-make44-parallel-build.patch ) src_install() { diff --git a/dev-lang/elixir/elixir-1.13.4.ebuild b/dev-lang/elixir/elixir-1.13.4.ebuild index 25bba3057f67..0d49f03bddd6 100644 --- a/dev-lang/elixir/elixir-1.13.4.ebuild +++ b/dev-lang/elixir/elixir-1.13.4.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch "${FILESDIR}"/${PN}-1.10.3-no-Q.patch "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch + "${FILESDIR}"/${PN}-1.14.1-make44-parallel-build.patch ) src_install() { diff --git a/dev-lang/elixir/elixir-1.14.0.ebuild b/dev-lang/elixir/elixir-1.14.0.ebuild index 9172eb24561c..cb7b7f6e750b 100644 --- a/dev-lang/elixir/elixir-1.14.0.ebuild +++ b/dev-lang/elixir/elixir-1.14.0.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch "${FILESDIR}"/${PN}-1.10.3-no-Q.patch "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch + "${FILESDIR}"/${PN}-1.14.1-make44-parallel-build.patch ) src_install() { diff --git a/dev-lang/elixir/files/elixir-1.14.1-make44-parallel-build.patch b/dev-lang/elixir/files/elixir-1.14.1-make44-parallel-build.patch new file mode 100644 index 000000000000..81d40f751da8 --- /dev/null +++ b/dev-lang/elixir/files/elixir-1.14.1-make44-parallel-build.patch @@ -0,0 +1,27 @@ +From c668ce22b0dd72261621f19f124490eb5425eacd Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Tue, 15 Nov 2022 21:38:50 +0000 +Subject: [PATCH] Disable parallel build in Make 4.4 + +In versions of GNU Make prior to 4.4, ".NOTPARALLEL: compile" made the whole +build run serially. In 4.4 and later, ".NOTPARALLEL: compile" makes only +the compile target run serially. + +This breaks the build and can lead to e.g. EEx being built before Mix. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f6ba18d90e..8bb5bcdc65 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,7 +24,7 @@ SOURCE_DATE_EPOCH_PATH = lib/elixir/tmp/ebin_reproducible + SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH + + .PHONY: install compile erlang elixir unicode app build_plt clean_plt dialyze test check_reproducible clean clean_residual_files format install_man clean_man docs Docs.zip Precompiled.zip zips +-.NOTPARALLEL: compile ++.NOTPARALLEL: + + #==> Functions + |