Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/glibc/2.21: 00_all_0029-Fix-parallel-build-error.patch README.history
Date: Wed, 17 Feb 2016 16:42:38
Message-Id: 20160217164234.0B42814AC@oystercatcher.gentoo.org
1 vapier 16/02/17 16:42:34
2
3 Modified: README.history
4 Added: 00_all_0029-Fix-parallel-build-error.patch
5 Log:
6 add upstream parallel build fix #574948
7
8 Revision Changes Path
9 1.10 src/patchsets/glibc/2.21/README.history
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?rev=1.10&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?rev=1.10&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/README.history?r1=1.9&r2=1.10
14
15 Index: README.history
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/glibc/2.21/README.history,v
18 retrieving revision 1.9
19 retrieving revision 1.10
20 diff -u -r1.9 -r1.10
21 --- README.history 17 Feb 2016 03:54:51 -0000 1.9
22 +++ README.history 17 Feb 2016 16:42:33 -0000 1.10
23 @@ -1,6 +1,7 @@
24 -7 [pending]
25 +7 17 Feb 2016
26 + 00_all_0028-CVE-2015-7547-getaddrinfo-stack-based-buffer-overflo.patch
27 D 10_all_glibc-CVE-2015-7547.patch
28 + + 00_all_0029-Fix-parallel-build-error.patch
29
30 6 16 Feb 2016
31 + 00_all_0023-CVE-2014-8121-Do-not-close-NSS-files-database-during.patch
32
33
34
35 1.1 src/patchsets/glibc/2.21/00_all_0029-Fix-parallel-build-error.patch
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/00_all_0029-Fix-parallel-build-error.patch?rev=1.1&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/glibc/2.21/00_all_0029-Fix-parallel-build-error.patch?rev=1.1&content-type=text/plain
39
40 Index: 00_all_0029-Fix-parallel-build-error.patch
41 ===================================================================
42 From 741e293d9b93e6c8a8926724502237417bd0adbc Mon Sep 17 00:00:00 2001
43 From: Andreas Schwab <schwab@××××.de>
44 Date: Mon, 2 Mar 2015 15:47:56 +0100
45 Subject: [PATCH] Fix parallel build error
46
47 https://bugs.gentoo.org/74948
48
49 (cherry picked from commit e8b6be0016f131c2ac72bf3213eabdb59800e63b)
50 (cherry picked from commit e04da210f7cd564c46a8db0e15a0c6e726f3977e)
51 ---
52 elf/Makefile | 2 +-
53 1 file changed, 1 insertion(+), 1 deletion(-)
54
55 diff --git a/elf/Makefile b/elf/Makefile
56 index 4882410..4813fcc 100644
57 --- a/elf/Makefile
58 +++ b/elf/Makefile
59 @@ -358,7 +358,7 @@ $(objpfx)interp.os: $(elf-objpfx)runtime-linker.h
60
61 $(elf-objpfx)runtime-linker.h: $(elf-objpfx)runtime-linker.st; @:
62 $(elf-objpfx)runtime-linker.st: $(common-objpfx)config.make
63 - $(name-target-directory)
64 + $(make-target-directory)
65 echo '#define RUNTIME_LINKER "$(rtlddir)/$(rtld-installed-name)"' \
66 > ${@:st=T}
67 $(move-if-change) ${@:st=T} ${@:st=h}
68 --
69 2.6.2