diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-12-12 18:32:15 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-12-12 18:32:15 -0500 |
| commit | eeb88b23cd80c5926eb8d31a06a5661709f09df1 (patch) | |
| tree | 0c426733237f6bec61c651335b77887865094634 /sys-apps/memtest86+ | |
| parent | sys-apps/memtest+: switch scp disable to a patch (diff) | |
| download | gentoo-eeb88b23cd80c5926eb8d31a06a5661709f09df1.tar.gz gentoo-eeb88b23cd80c5926eb8d31a06a5661709f09df1.tar.bz2 gentoo-eeb88b23cd80c5926eb8d31a06a5661709f09df1.zip | |
sys-apps/memtest+: fix parallel build errors #557890
Diffstat (limited to 'sys-apps/memtest86+')
| -rw-r--r-- | sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch | 16 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-5.01-r1.ebuild | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch new file mode 100644 index 000000000000..876edcf68360 --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch @@ -0,0 +1,16 @@ +don't run the clean target when building all as we run into parallel races: + - memtest kicks off building of a bunch of .o files + - clean runs in parallel which runs `rm` and deletes some of the new .o + - memtest goes to link and fails because objects are missing + +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ + smp.o vmem.o random.o + + +-all: clean memtest.bin memtest ++all: memtest.bin memtest + + # Link it statically once so I know I don't have undefined + # symbols and then link it dynamically so I have full diff --git a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild index f18f5b0fb70b..6186228b89cc 100644 --- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild @@ -29,6 +29,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-no-scp.patch epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312 epatch "${FILESDIR}"/${P}-reboot-def.patch #548312 + epatch "${FILESDIR}"/${P}-no-clean.patch #557890 if use serial ; then sed -i \ |