1 |
commit: 8b549d5e1df24d0d3a36e7454b84d04f7bec281b |
2 |
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 24 10:24:30 2017 +0000 |
4 |
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 24 10:24:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b549d5e |
7 |
|
8 |
sci-geosciences/routino: making QA checks happy |
9 |
|
10 |
Suggested-by: Fabio Rossi <rossi.f <AT> inwind.it> |
11 |
Closes: https://bugs.gentoo.org/628398 |
12 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
13 |
|
14 |
sci-geosciences/routino/files/routino-3.1.1.patch | 38 +++++++++++++++----- |
15 |
sci-geosciences/routino/files/routino-3.2.patch | 42 ++++++++++++++++++----- |
16 |
sci-geosciences/routino/routino-3.1.1.ebuild | 17 ++++++--- |
17 |
sci-geosciences/routino/routino-3.2.ebuild | 15 ++++++-- |
18 |
4 files changed, 89 insertions(+), 23 deletions(-) |
19 |
|
20 |
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch |
21 |
index 15ba41b73fe..ac54fcf9f88 100644 |
22 |
--- a/sci-geosciences/routino/files/routino-3.1.1.patch |
23 |
+++ b/sci-geosciences/routino/files/routino-3.1.1.patch |
24 |
@@ -1,17 +1,22 @@ |
25 |
-diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf |
26 |
---- routino-3.1.1.orig/Makefile.conf 2016-03-05 19:49:21.000000000 +0600 |
27 |
-+++ routino-3.1.1/Makefile.conf 2016-07-16 20:09:22.208869580 +0600 |
28 |
-@@ -47,3 +47,3 @@ |
29 |
+--- routino-3.1.1/Makefile.conf 2017-10-22 15:55:10.420531850 +0200 |
30 |
++++ routino-3.1.1/Makefile.conf.new 2017-10-22 15:55:32.180533067 +0200 |
31 |
+@@ -45,11 +45,11 @@ |
32 |
+ # Installation locations (edit if required) |
33 |
+ |
34 |
ifneq ($(HOST),MINGW) |
35 |
-prefix=/usr/local |
36 |
+prefix=/usr |
37 |
bindir=$(prefix)/bin |
38 |
-@@ -51,3 +51,3 @@ |
39 |
+ incdir=$(prefix)/include |
40 |
libdir=$(prefix)/lib |
41 |
-docdir=$(prefix)/doc/routino |
42 |
+docdir=$(prefix)/share/doc/$(PF) |
43 |
datadir=$(prefix)/share/routino |
44 |
-@@ -76,6 +76,6 @@ |
45 |
+ else |
46 |
+ prefix="c:/Program Files/Routino" |
47 |
+@@ -74,16 +74,16 @@ |
48 |
+ |
49 |
+ |
50 |
# Maths library |
51 |
-LDFLAGS=-lm |
52 |
+LDFLAGS+=-lm |
53 |
@@ -20,15 +25,32 @@ diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf |
54 |
-CFLAGS=-std=c99 |
55 |
+CFLAGS+=-std=c99 |
56 |
|
57 |
-@@ -85,3 +85,3 @@ |
58 |
+ # Warning options |
59 |
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic |
60 |
+ |
61 |
# Optimisation options |
62 |
-CFLAGS+=-O3 |
63 |
+#CFLAGS+=-O3 |
64 |
CFLAGS+=-ffast-math |
65 |
-@@ -141,4 +141,4 @@ |
66 |
+ |
67 |
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). |
68 |
+@@ -118,7 +118,7 @@ |
69 |
+ endif |
70 |
+ |
71 |
+ # Put the current directory in the shared library path for the router using libroutino |
72 |
+-LDFLAGS_LDSO=-Wl,-R. |
73 |
++#LDFLAGS_LDSO=-Wl,-R. |
74 |
+ |
75 |
+ |
76 |
+ # Required for multi-threaded support (comment these two lines out if not required) |
77 |
+@@ -139,8 +139,8 @@ |
78 |
+ |
79 |
+ |
80 |
# Required for xz support (uncomment these two lines if required) |
81 |
-#CFLAGS+=-DUSE_XZ |
82 |
-#LDFLAGS+=-llzma |
83 |
+CFLAGS+=-DUSE_XZ |
84 |
+LDFLAGS+=-llzma |
85 |
|
86 |
+ |
87 |
+ # Required to use stdio with files > 2GiB on 32-bit system. |
88 |
|
89 |
diff --git a/sci-geosciences/routino/files/routino-3.2.patch b/sci-geosciences/routino/files/routino-3.2.patch |
90 |
index 484b61b68f1..81b6c4d938c 100644 |
91 |
--- a/sci-geosciences/routino/files/routino-3.2.patch |
92 |
+++ b/sci-geosciences/routino/files/routino-3.2.patch |
93 |
@@ -1,30 +1,56 @@ |
94 |
-diff -r -U1 routino-3.2.orig/Makefile.conf routino-3.2/Makefile.conf |
95 |
---- routino-3.2.orig/Makefile.conf 2016-11-22 20:22:52.000000000 +0100 |
96 |
-+++ routino-3.2/Makefile.conf 2017-04-01 23:58:23.835905270 +0200 |
97 |
-@@ -47,3 +47,3 @@ |
98 |
+--- routino-3.2/Makefile.conf 2017-10-22 16:03:29.917559780 +0200 |
99 |
++++ routino-3.2/Makefile.conf.new 2017-10-22 16:04:23.877562797 +0200 |
100 |
+@@ -45,11 +45,11 @@ |
101 |
+ # Installation locations (edit if required) |
102 |
+ |
103 |
ifneq ($(HOST),MINGW) |
104 |
-prefix=/usr/local |
105 |
+prefix=/usr |
106 |
bindir=$(prefix)/bin |
107 |
-@@ -51,3 +51,3 @@ |
108 |
+ incdir=$(prefix)/include |
109 |
libdir=$(prefix)/lib |
110 |
-docdir=$(prefix)/doc/routino |
111 |
+docdir=$(prefix)/share/doc/$(PF) |
112 |
datadir=$(prefix)/share/routino |
113 |
-@@ -79,3 +79,3 @@ |
114 |
+ else |
115 |
+ prefix="c:/Program Files/Routino" |
116 |
+@@ -74,16 +74,16 @@ |
117 |
+ |
118 |
+ |
119 |
+ # Maths library |
120 |
+-LDFLAGS=-lm |
121 |
++LDFLAGS+=-lm |
122 |
+ |
123 |
# Language dialect selection |
124 |
-CFLAGS=-std=c99 |
125 |
+CFLAGS+=-std=c99 |
126 |
|
127 |
-@@ -85,3 +85,3 @@ |
128 |
+ # Warning options |
129 |
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic |
130 |
+ |
131 |
# Optimisation options |
132 |
-CFLAGS+=-O3 |
133 |
+#CFLAGS+=-O3 |
134 |
CFLAGS+=-ffast-math |
135 |
-@@ -141,4 +141,4 @@ |
136 |
+ |
137 |
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). |
138 |
+@@ -118,7 +118,7 @@ |
139 |
+ endif |
140 |
+ |
141 |
+ # Put the current directory in the shared library path for the router using libroutino |
142 |
+-LDFLAGS_LDSO=-Wl,-R. |
143 |
++#LDFLAGS_LDSO=-Wl,-R. |
144 |
+ |
145 |
+ |
146 |
+ # Required for multi-threaded support (comment these two lines out if not required) |
147 |
+@@ -139,8 +139,8 @@ |
148 |
+ |
149 |
+ |
150 |
# Required for xz support (uncomment these two lines if required) |
151 |
-#CFLAGS+=-DUSE_XZ |
152 |
-#LDFLAGS+=-llzma |
153 |
+CFLAGS+=-DUSE_XZ |
154 |
+LDFLAGS+=-llzma |
155 |
|
156 |
+ |
157 |
+ # Required to use stdio with files > 2GiB on 32-bit system. |
158 |
|
159 |
diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild |
160 |
index 54aadaee9dd..724e40b2079 100644 |
161 |
--- a/sci-geosciences/routino/routino-3.1.1.ebuild |
162 |
+++ b/sci-geosciences/routino/routino-3.1.1.ebuild |
163 |
@@ -1,7 +1,10 @@ |
164 |
-# Copyright 1999-2016 Gentoo Foundation |
165 |
+# Copyright 1999-2017 Gentoo Foundation |
166 |
# Distributed under the terms of the GNU General Public License v2 |
167 |
+ |
168 |
EAPI=6 |
169 |
|
170 |
+inherit toolchain-funcs |
171 |
+ |
172 |
DESCRIPTION="Routing application based on openstreetmap data" |
173 |
HOMEPAGE="http://www.routino.org/" |
174 |
SRC_URI="http://www.routino.org/download/${P}.tgz" |
175 |
@@ -10,10 +13,16 @@ SLOT="0" |
176 |
KEYWORDS="amd64 x86" |
177 |
IUSE="" |
178 |
DEPEND="" |
179 |
-PATCHES=( "${FILESDIR}"/${P}.patch ) |
180 |
|
181 |
-src_configure() { |
182 |
- : |
183 |
+src_prepare() { |
184 |
+ eapply "${FILESDIR}"/${P}.patch |
185 |
+ |
186 |
+ sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ |
187 |
+ -e "s@CC=gcc@CC=$(tc-getCC)@" \ |
188 |
+ -e "s@LD=gcc@LD=$(tc-getCC)@" \ |
189 |
+ Makefile.conf || die "failed sed" |
190 |
+ |
191 |
+ eapply_user |
192 |
} |
193 |
|
194 |
src_compile() { |
195 |
|
196 |
diff --git a/sci-geosciences/routino/routino-3.2.ebuild b/sci-geosciences/routino/routino-3.2.ebuild |
197 |
index cb1ceff2cd3..19512b20efa 100644 |
198 |
--- a/sci-geosciences/routino/routino-3.2.ebuild |
199 |
+++ b/sci-geosciences/routino/routino-3.2.ebuild |
200 |
@@ -1,7 +1,10 @@ |
201 |
# Copyright 1999-2017 Gentoo Foundation |
202 |
# Distributed under the terms of the GNU General Public License v2 |
203 |
+ |
204 |
EAPI=6 |
205 |
|
206 |
+inherit toolchain-funcs |
207 |
+ |
208 |
DESCRIPTION="Routing application based on openstreetmap data" |
209 |
HOMEPAGE="http://www.routino.org/" |
210 |
SRC_URI="http://www.routino.org/download/${P}.tgz" |
211 |
@@ -10,10 +13,16 @@ SLOT="0" |
212 |
KEYWORDS="~amd64 ~x86" |
213 |
IUSE="" |
214 |
DEPEND="" |
215 |
-PATCHES=( "${FILESDIR}"/${P}.patch ) |
216 |
|
217 |
-src_configure() { |
218 |
- : |
219 |
+src_prepare() { |
220 |
+ eapply "${FILESDIR}"/${P}.patch |
221 |
+ |
222 |
+ sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \ |
223 |
+ -e "s@CC=gcc@CC=$(tc-getCC)@" \ |
224 |
+ -e "s@LD=gcc@LD=$(tc-getCC)@" \ |
225 |
+ Makefile.conf || die "failed sed" |
226 |
+ |
227 |
+ eapply_user |
228 |
} |
229 |
|
230 |
src_compile() { |