Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/coq/files: coqide.desktop coq-8.1_p3-cmxa-install.dpatch coq-8.1_p3-noocamlopt.patch
Date: Thu, 03 Jan 2008 17:42:06
Message-Id: E1JAU4u-00069o-BK@stork.gentoo.org
1 aballier 08/01/03 17:42:00
2
3 Modified: coqide.desktop
4 Added: coq-8.1_p3-cmxa-install.dpatch
5 coq-8.1_p3-noocamlopt.patch
6 Log:
7 Add support for building without ocamlopt, import smimou's patches from debian to allow it. Fix desktop entry categories.
8 (Portage version: 2.1.4_rc14)
9
10 Revision Changes Path
11 1.2 sci-mathematics/coq/files/coqide.desktop
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coqide.desktop?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coqide.desktop?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coqide.desktop?r1=1.1&r2=1.2
16
17 Index: coqide.desktop
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/files/coqide.desktop,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- coqide.desktop 28 Dec 2004 05:03:02 -0000 1.1
24 +++ coqide.desktop 3 Jan 2008 17:41:59 -0000 1.2
25 @@ -7,4 +7,4 @@
26 GenericName=Coq IDE
27 Terminal=false
28 Type=Application
29 -Categories=Application;Edutainment;Mathematics;
30 +Categories=Application;Education;Math;
31
32
33
34 1.1 sci-mathematics/coq/files/coq-8.1_p3-cmxa-install.dpatch
35
36 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coq-8.1_p3-cmxa-install.dpatch?rev=1.1&view=markup
37 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coq-8.1_p3-cmxa-install.dpatch?rev=1.1&content-type=text/plain
38
39 Index: coq-8.1_p3-cmxa-install.dpatch
40 ===================================================================
41 #! /bin/sh /usr/share/dpatch/dpatch-run
42 ## cmxa-install.dpatch by Samuel Mimram <smimram@××××××.org>
43 ##
44 ## All lines beginning with `## DP:' are a description of the patch.
45 ## DP: .cmxa are not generated on non-native archs, so don't install them.
46
47 @DPATCH@
48 diff -urNad coq-8.1+dfsg~/Makefile coq-8.1+dfsg/Makefile
49 --- coq-8.1+dfsg~/Makefile 2007-02-18 13:25:29.000000000 +0100
50 +++ coq-8.1+dfsg/Makefile 2007-02-18 13:27:28.000000000 +0100
51 @@ -1272,7 +1272,11 @@
52 parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \
53 parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma
54
55 -OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
56 +ifeq ($(BEST),opt)
57 + OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
58 +else
59 + OBJECTCMXA=
60 +endif
61
62 install-library:
63 $(MKDIR) $(FULLCOQLIB)
64
65
66
67 1.1 sci-mathematics/coq/files/coq-8.1_p3-noocamlopt.patch
68
69 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coq-8.1_p3-noocamlopt.patch?rev=1.1&view=markup
70 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/coq/files/coq-8.1_p3-noocamlopt.patch?rev=1.1&content-type=text/plain
71
72 Index: coq-8.1_p3-noocamlopt.patch
73 ===================================================================
74 Index: coq-8.1pl3/Makefile
75 ===================================================================
76 --- coq-8.1pl3.orig/Makefile
77 +++ coq-8.1pl3/Makefile
78 @@ -1481,7 +1481,7 @@ dev/printers.cma: $(PRINTERSCMO)
79 parsing/grammar.cma: $(GRAMMARCMO)
80 $(SHOW)'Testing $@'
81 @touch test.ml4
82 - $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
83 + $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENSIONS) $(GRAMMARCMO) -impl" -impl test.ml4 -o test-grammar
84 @rm -f test-grammar test.*
85 $(SHOW)'OCAMLC -a $@'
86 $(HIDE)$(OCAMLC) $(BYTEFLAGS) $(GRAMMARCMO) -linkall -a -o $@
87
88
89
90 --
91 gentoo-commits@g.o mailing list