Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/cgal-python/files: cgal-python-0.9.4_beta1-linking.patch
Date: Fri, 26 Feb 2010 00:30:43
Message-Id: E1Nko6H-00041M-Cm@stork.gentoo.org
1 ssuominen 10/02/26 00:30:37
2
3 Added: cgal-python-0.9.4_beta1-linking.patch
4 Log:
5 Link to CGAL, mpfr and gmp (if cgal was built with USE="gmp") wrt #306887, thanks to Kamil Kisiel for reporting.
6 (Portage version: 2.2_rc63/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/cgal-python/files/cgal-python-0.9.4_beta1-linking.patch?rev=1.1&content-type=text/plain
13
14 Index: cgal-python-0.9.4_beta1-linking.patch
15 ===================================================================
16 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile
17 --- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_2/Makefile 2009-03-17 16:34:46.000000000 +0200
18 +++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_2/Makefile 2010-02-26 01:40:39.000000000 +0200
19 @@ -12,7 +12,7 @@
20
21 all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_2_module)
22 @echo 'Creating a Python modules'
23 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
24 + @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
25 @echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
26
27 .cpp.o:
28 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile
29 --- cgal-python-0.9.4-beta1.orig/bindings/Alpha_shapes_3/Makefile 2009-03-17 16:34:46.000000000 +0200
30 +++ cgal-python-0.9.4-beta1/bindings/Alpha_shapes_3/Makefile 2010-02-26 01:40:22.000000000 +0200
31 @@ -12,7 +12,7 @@
32
33 all: $(OBJ_of_Kernel_module) $(OBJ_of_Triangulation_3_module)
34 @echo 'Creating a Python modules'
35 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
36 + @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
37 @echo '$(Kernel_module) module is created in ./$(Kernel_module)/$(Kernel_module).so'
38
39 .cpp.o:
40 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile
41 --- cgal-python-0.9.4-beta1.orig/bindings/Convex_hull_2/Makefile 2009-03-17 16:34:46.000000000 +0200
42 +++ cgal-python-0.9.4-beta1/bindings/Convex_hull_2/Makefile 2010-02-26 01:41:08.000000000 +0200
43 @@ -11,7 +11,7 @@
44
45 all: $(OBJ_of_Convex_hull_module) $(OBJ_of_Triangulation_2_module)
46 @echo 'Creating a Python modules'
47 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Convex_hull_module) -o $(Convex_hull_module).so
48 + @g++ $(LDFLAGS) $(OBJ_of_Convex_hull_module) -o $(Convex_hull_module).so $(CGAL_PYTHON_LDFLAGS)
49 @echo '$(Convex_hull_module) module is created in ./$(Convex_hull_module)/$(Convex_hull_module).so'
50
51 .cpp.o:
52 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile
53 --- cgal-python-0.9.4-beta1.orig/bindings/Geometric_Optimisation/Makefile 2009-03-17 16:34:47.000000000 +0200
54 +++ cgal-python-0.9.4-beta1/bindings/Geometric_Optimisation/Makefile 2010-02-26 01:41:49.000000000 +0200
55 @@ -15,7 +15,7 @@
56
57 all: $(OBJ_of_Optimisation_module)
58 @echo 'Creating a Python modules'
59 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Optimisation_module) -o $(Optimisation_module).so
60 + @g++ $(LDFLAGS) $(OBJ_of_Optimisation_module) -o $(Optimisation_module).so $(CGAL_PYTHON_LDFLAGS)
61 @echo '$(Optimisation_module) module is created in ./$(Optimisation_module)/$(Optimisation_module).so'
62
63 .cpp.o:
64 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile cgal-python-0.9.4-beta1/bindings/Kernel/Makefile
65 --- cgal-python-0.9.4-beta1.orig/bindings/Kernel/Makefile 2009-03-17 16:34:46.000000000 +0200
66 +++ cgal-python-0.9.4-beta1/bindings/Kernel/Makefile 2010-02-26 01:39:57.000000000 +0200
67 @@ -41,7 +41,7 @@
68
69 all: $(OBJ_of_Kernel_module)
70 @echo 'Creating a Python modules'
71 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so
72 + @g++ $(LDFLAGS) $(OBJ_of_Kernel_module) -o $(Kernel_module).so $(CGAL_PYTHON_LDFLAGS)
73 @echo 'Kernel is created in ./$(Kernel_module)/'
74
75 .cpp.o:
76 diff -ur cgal-python-0.9.4-beta1.orig/bindings/makefile.inc cgal-python-0.9.4-beta1/bindings/makefile.inc
77 --- cgal-python-0.9.4-beta1.orig/bindings/makefile.inc 2009-03-17 16:34:47.000000000 +0200
78 +++ cgal-python-0.9.4-beta1/bindings/makefile.inc 2010-02-26 01:48:10.000000000 +0200
79 @@ -9,7 +9,6 @@
80 # as it would prefer, e.g. -lpython2.4 on FC5.
81 LDOPT=`(uname | grep Darwin > /dev/null) && echo "-dynamiclib -lpython" || echo "-shared"`
82
83 -CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python $(LDFLAGS) $(CGAL_LDFLAGS)
84 -
85 +CGAL_PYTHON_LDFLAGS=$(LDOPT) -lboost_python -lCGAL -lCGAL_Core -lmpfr $(CGAL_LDFLAGS)
86
87 CGAL_PYTHON_CXXFLAGS=-fPIC -DCGAL_DONT_USE_LAZY_KERNEL $(CXXFLAGS) $(CPPFLAGS) $(CGAL_CXXFLAGS) -I../.. -O2
88 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile
89 --- cgal-python-0.9.4-beta1.orig/bindings/Mesh_2/Makefile 2009-03-17 16:34:47.000000000 +0200
90 +++ cgal-python-0.9.4-beta1/bindings/Mesh_2/Makefile 2010-02-26 01:40:53.000000000 +0200
91 @@ -12,7 +12,7 @@
92
93 all:$(OBJ_of_Mesh_2_module)
94 @echo 'Creating a Python modules'
95 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so
96 + @g++ $(LDFLAGS) $(OBJ_of_Mesh_2_module) -o $(Mesh_2_module).so $(CGAL_PYTHON_LDFLAGS)
97 @echo '$(Mesh_2_module) module is created in ./$(Mesh_2_module)/$(Mesh_2_module).so'
98
99 .cpp.o:
100 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile
101 --- cgal-python-0.9.4-beta1.orig/bindings/Polyhedron/Makefile 2009-03-17 16:34:46.000000000 +0200
102 +++ cgal-python-0.9.4-beta1/bindings/Polyhedron/Makefile 2010-02-26 01:41:38.000000000 +0200
103 @@ -13,7 +13,7 @@
104
105 all:$(OBJ_of_Polyhedron_module)
106 @echo 'Creating a Python modules'
107 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Polyhedron_module) -o $(Polyhedron_module).so
108 + @g++ $(LDFLAGS) $(OBJ_of_Polyhedron_module) -o $(Polyhedron_module).so $(CGAL_PYTHON_LDFLAGS)
109 @echo '$(Polyhedron_module) module is created in ./$(Polyhedron_module)/$(Polyhedron_module).so'
110
111 .cpp.o:
112 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile
113 --- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_2/Makefile 2009-03-17 16:34:46.000000000 +0200
114 +++ cgal-python-0.9.4-beta1/bindings/Triangulations_2/Makefile 2010-02-26 01:41:24.000000000 +0200
115 @@ -17,7 +17,7 @@
116
117 all:$(OBJ_of_Triangulation_2_module)
118 @echo 'Creating a Python modules'
119 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_2_module) -o $(Triangulation_2_module).so
120 + @g++ $(LDFLAGS) $(OBJ_of_Triangulation_2_module) -o $(Triangulation_2_module).so $(CGAL_PYTHON_LDFLAGS)
121 @echo '$(Triangulation_2_module) module is created in ./$(Triangulation_2_module)/$(Triangulation_2_module).so'
122
123 .cpp.o:
124 diff -ur cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile
125 --- cgal-python-0.9.4-beta1.orig/bindings/Triangulations_3/Makefile 2009-03-17 16:34:46.000000000 +0200
126 +++ cgal-python-0.9.4-beta1/bindings/Triangulations_3/Makefile 2010-02-26 01:39:41.000000000 +0200
127 @@ -14,7 +14,7 @@
128
129 all:$(OBJ_of_Triangulation_3_module)
130 @echo 'Creating a Python modules'
131 - @g++ $(CGAL_PYTHON_LDFLAGS) $(OBJ_of_Triangulation_3_module) -o $(Triangulation_3_module).so
132 + @g++ $(LDFLAGS) $(OBJ_of_Triangulation_3_module) -o $(Triangulation_3_module).so $(CGAL_PYTHON_LDFLAGS)
133 @echo '$(Triangulation_3_module) module is created in ./$(Triangulation_3_module)/$(Triangulation_3_module).so'
134
135 .cpp.o: