Gentoo Archives: gentoo-commits

From: "Roy Marples (uberlord)" <uberlord@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-ml/facile/files: facile-1.1-make.patch
Date: Tue, 23 Oct 2007 12:21:28
Message-Id: E1IkIl5-000448-As@stork.gentoo.org
1 uberlord 07/10/23 12:21:19
2
3 Added: facile-1.1-make.patch
4 Log:
5 Fix building on non GNU platforms and keyword ~x86-fbsd, #192065
6 (Portage version: 2.1.3.15)
7
8 Revision Changes Path
9 1.1 dev-ml/facile/files/facile-1.1-make.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/files/facile-1.1-make.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/files/facile-1.1-make.patch?rev=1.1&content-type=text/plain
13
14 Index: facile-1.1-make.patch
15 ===================================================================
16 diff -ur a/Makefile b/Makefile
17 --- a/Makefile 2004-09-08 10:51:02 +0100
18 +++ b/Makefile 2007-10-23 13:11:28 +0100
19 @@ -3,7 +3,7 @@
20 include config_Makefile
21
22 compile:
23 - cd src; make
24 + cd src; $(MAKE)
25
26 install:
27 if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi
28 @@ -14,10 +14,10 @@
29 chmod a+r $(FACILEDIR)/facile.a
30
31 clean:
32 - cd src; make clean
33 + cd src; $(MAKE) clean
34
35 distclean uninstall:
36 rm -fr $(FACILEDIR)
37
38 check:
39 - cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
40 + cd examples; $(MAKE) FACILEDIR=../src queens.opt; ./queens.opt 8
41 diff -ur a/src/Makefile b/src/Makefile
42 --- a/src/Makefile 2004-09-08 10:51:02 +0100
43 +++ b/src/Makefile 2007-10-23 13:10:34 +0100
44 @@ -28,7 +28,7 @@
45 # Version of the library to be linked with the -p (profiler) option
46 facile.p.cmxa : $(CSTR)
47 rm -fr $(CSTRCMX)
48 - make facile.cmxa OPTOPT=-p
49 + $(MAKE) facile.cmxa OPTOPT=-p
50 rm -fr $(CSTRCMX)
51 mv facile.cmxa $@
52 mv facile.a facile.p.a
53 @@ -41,8 +41,8 @@
54 # Does not work with many modules (e.g. containing class expressions
55 facile.exp.cmxa : $(CSTR)
56 rm -fr $(CSTRCMX)
57 - make fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx
58 - make facile.cmxa OPTOPT="-pp inline_functors"
59 + $(MAKE) fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx
60 + $(MAKE) facile.cmxa OPTOPT="-pp inline_functors"
61 rm -fr $(CSTRCMX)
62 mv facile.cmxa $@
63 mv facile.a facile.exp.a
64
65
66
67 --
68 gentoo-commits@g.o mailing list