diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-12-01 23:22:51 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-12-01 23:24:07 +0100 |
| commit | cc257ee493bbf3261417908684dbff834d853ae6 (patch) | |
| tree | cca896590d214d7bc90aad71fb8a76465438242b /package/mono/0003-fix-parallel-install.patch | |
| parent | 2723fa4a5066b8820b4ff03e2912ccea9ea7c5e0 (diff) | |
| parent | 01e3d2eff15eb2535c4c15eb4f62467a50fe6a5f (diff) | |
| download | buildroot-cc257ee493bbf3261417908684dbff834d853ae6.tar.gz buildroot-cc257ee493bbf3261417908684dbff834d853ae6.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/mono/0003-fix-parallel-install.patch')
| -rw-r--r-- | package/mono/0003-fix-parallel-install.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/mono/0003-fix-parallel-install.patch b/package/mono/0003-fix-parallel-install.patch deleted file mode 100644 index c151173247..0000000000 --- a/package/mono/0003-fix-parallel-install.patch +++ /dev/null @@ -1,40 +0,0 @@ -mcs: fix installation with parallel make - -In mcs/ the install of xbuild_12 and xbuild_14 will end-up installing -the same files: - ${NETFRAMEWORK_DIR}/v2.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v3.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v3.5/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.0/Profile/Client/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.0/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.5.1/RedistList/FrameworkList.xml - ${NETFRAMEWORK_DIR}/v4.5/RedistList/FrameworkList.xml - -This is because there is no atomicity when installing each file, and -xbuild_12 and xbuild_14 may well run in parallel, each trying to install -each of those files; but the 'install' utility will first check if the -target file exists or not, and behaves differently if it does than if it -does not, thus leading to build failures like so: - http://autobuild.buildroot.org/results/c32/c3288c5d1fb94474f14a4a889e76135878d403bc/build-end.log - -So, ensure ordering of the install of xbuild_12 and xbuild_14 (the -ordering is completely arbitrary, either way gives the same installed -files). - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> -Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com> - -diff -durN host-mono-4.0.0.orig/mcs/Makefile host-mono-4.0.0/mcs/Makefile ---- host-mono-4.0.0.orig/mcs/Makefile 2015-04-09 16:55:53.000000000 +0200 -+++ host-mono-4.0.0/mcs/Makefile 2015-05-16 17:25:44.475542483 +0200 -@@ -43,6 +43,10 @@ - profile-do--%: - $(MAKE) PROFILE=$(subst --, ,$*) - -+# xbuild_12 and xbuild_14 will try to install the same files, so they need -+# to be ordered -+profile-do--xbuild_14--install: profile-do--xbuild_12--install -+ - # We don't want to run the tests in parallel. We want behaviour like -k. - profiles-do--run-test: - ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret |
