diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2014-07-17 07:27:48 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2014-07-17 07:27:48 +0000 |
| commit | 59d7cfec44f25c04027f957785571510da3071c0 (patch) | |
| tree | 87a7bbc37e734a5603592cd1aa214e32441a11e2 /app-misc | |
| parent | fix for nova 2014.1.1 CVE-2014-3517, we good yo (diff) | |
| download | gentoo-2-59d7cfec44f25c04027f957785571510da3071c0.tar.gz gentoo-2-59d7cfec44f25c04027f957785571510da3071c0.tar.bz2 gentoo-2-59d7cfec44f25c04027f957785571510da3071c0.zip | |
Fix parallelbuild again. Bug #516834
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0145142D)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/geneweb/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch | 38 |
2 files changed, 41 insertions, 3 deletions
diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog index 2aa7179cd421..ed4e749f1f15 100644 --- a/app-misc/geneweb/ChangeLog +++ b/app-misc/geneweb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/geneweb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.29 2014/07/16 06:04:46 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.30 2014/07/17 07:27:48 tupone Exp $ + + 17 Jul 2014; Alfredo Tupone <tupone@gentoo.org> + files/geneweb-6.07-parallellbuild.patch: + Fix parallelbuild again. Bug #516834 16 Jul 2014; Alfredo Tupone <tupone@gentoo.org> geneweb-6.07.ebuild: Require ocamlopt for dev-ml/camlp5 when ocamlopt is requested. diff --git a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch index a1b5fe742a17..fb0c33b964bb 100644 --- a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch +++ b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch @@ -1,9 +1,12 @@ --- wserver/Makefile.old 2011-03-11 13:47:04.000000000 +0100 +++ wserver/Makefile 2011-03-11 13:47:20.000000000 +0100 -@@ -5,7 +5,8 @@ +@@ -4,8 +4,10 @@ + OBJS=wserver.cmo - all:: pa_macro5.cmo $(OBJS) +-all:: pa_macro5.cmo $(OBJS) ++all:: pa_macro5.cmo ++ $(MAKE) $(OBJS) -opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx) +opt:: pa_macro5.cmo + $(MAKE) $(OBJS:.cmo=.cmx) @@ -21,3 +24,34 @@ always: depend: +--- src/.depend.old 2014-07-17 09:18:26.882149121 +0200 ++++ src/.depend 2014-07-17 09:19:07.981770328 +0200 +@@ -162,7 +162,7 @@ + mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx + history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \ + gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \ +- history_diff.cmi ../wserver/wserver.cmi history.cmi ++ history_diff.cmo ../wserver/wserver.cmi history.cmi + history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \ + gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \ + history_diff.cmx ../wserver/wserver.cmx history.cmi +--- ged2gwb/.depend.old 2014-07-17 09:23:02.119612299 +0200 ++++ ged2gwb/.depend 2014-07-17 09:23:53.987134380 +0200 +@@ -1,7 +1,7 @@ + ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \ + ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \ + ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \ +- ../src/name.cmi ../src/secure.cmi ./utf8.cmi ++ ../src/name.cmi ../src/secure.cmi ./utf8.cmo + ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ + ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \ + ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \ +@@ -10,7 +10,7 @@ + ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \ + ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \ + ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \ +- ../src/secure.cmi ./utf8.cmi ++ ../src/secure.cmi ./utf8.cmo + ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ + ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \ + ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \ |