Gentoo Archives: gentoo-commits

From: "Ian Stakenvicius (axs)" <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/elinks/files: elinks-9999-parallel-make.patch
Date: Sat, 31 May 2014 04:14:45
Message-Id: 20140531041440.E4C762004F@flycatcher.gentoo.org
1 axs 14/05/31 04:14:40
2
3 Added: elinks-9999-parallel-make.patch
4 Log:
5 fixed parallel make issue (bug 461014); added live ebuild as upstream has been fairly active since last release
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
8
9 Revision Changes Path
10 1.1 www-client/elinks/files/elinks-9999-parallel-make.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/elinks/files/elinks-9999-parallel-make.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/elinks/files/elinks-9999-parallel-make.patch?rev=1.1&content-type=text/plain
14
15 Index: elinks-9999-parallel-make.patch
16 ===================================================================
17 --- a/Makefile.lib 2014-05-30 13:45:11.756422117 -0400
18 +++ b/Makefile.lib 2014-05-30 13:47:22.626423230 -0400
19 @@ -117,7 +117,7 @@
20 $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
21 $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
22
23 -$(LIB_O_NAME): $(LIB_O_DEPS)
24 +$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
25 $(call cmd,ld_objs)
26
27 DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
28 @@ -260,21 +260,36 @@
29 # remaining subdirectories, but return an error at the end.
30 $(RULES_REC):
31 ifneq (,$(findstring k,$(MAKEFLAGS)))
32 - @suberr=0; \
33 + @+suberr=0; \
34 $(foreach subdir,$(sort $(SUBDIRS)), \
35 $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
36 exit $$suberr
37 else
38 - @$(foreach subdir,$(sort $(SUBDIRS)), \
39 + @+$(foreach subdir,$(sort $(SUBDIRS)), \
40 $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
41 endif
42
43 +all-recursive.built:
44 +ifneq (,$(findstring k,$(MAKEFLAGS)))
45 + @+suberr=0; \
46 + $(foreach subdir,$(sort $(SUBDIRS)), \
47 + $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
48 + [ $$suberr == 0 ] && touch $@; \
49 + exit $$suberr
50 +else
51 + @+$(foreach subdir,$(sort $(SUBDIRS)), \
52 + $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
53 + touch $@
54 +endif
55 +
56 +CLEAN += all-recursive.built
57 +
58 # Dummy -local rules
59 $(RULES_LOCAL):
60
61 # Default deps
62 rule_deps = $(1)-recursive $(1)-default $(1)-local
63 -all: $(call rule_deps,all)
64 +all: $(subst recursive,recursive.built,$(call rule_deps,all))
65 install: $(call rule_deps,install)
66 clean: $(call rule_deps,clean)
67 cleanall: $(call rule_deps,cleanall)