Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/coinor-cppad/files: coinor-cppad-20140519-dash.patch coinor-cppad-20140519-boost.patch
Date: Fri, 31 Oct 2014 09:08:48
Message-Id: 20141031090843.C7147921B@oystercatcher.gentoo.org
1 jlec 14/10/31 09:08:43
2
3 Added: coinor-cppad-20140519-dash.patch
4 coinor-cppad-20140519-boost.patch
5 Log:
6 sci-libs/coinor-cppad: Fix incomptibility with /bin/sh -> dash; #527496; fix boost detection
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
9
10 Revision Changes Path
11 1.1 sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-cppad/files/coinor-cppad-20140519-dash.patch?rev=1.1&content-type=text/plain
15
16 Index: coinor-cppad-20140519-dash.patch
17 ===================================================================
18 configure.ac | 56 ++++++++++++++++++++++++++++----------------------------
19 1 file changed, 28 insertions(+), 28 deletions(-)
20
21 diff --git a/configure.ac b/configure.ac
22 index 9e917dd..033621f 100644
23 --- a/configure.ac
24 +++ b/configure.ac
25 @@ -194,7 +194,7 @@ AC_ARG_WITH(sparse_list,
26 )
27 AC_MSG_RESULT([$sparse_list])
28 if test "$sparse_set" = "yes" ; then
29 - if test "$sparse_list" == "yes" ; then
30 + if test "$sparse_list" = "yes" ; then
31 AC_MSG_ERROR([cannot --with both sparse_set and sparse_list])
32 fi
33 AC_SUBST(cppad_internal_sparse_set, sparse_set)
34 @@ -374,7 +374,7 @@ AC_SUBST(cppad_max_num_threads, [$max_num_threads])
35 dnl type used for addresses in AD tapes [ default = unsigned int ] -----------
36 AC_MSG_CHECKING([TAPE_ADDR_TYPE])
37 AC_ARG_VAR(TAPE_ADDR_TYPE, [type used for addresses in AD tapes])
38 -if test "$TAPE_ADDR_TYPE" == "" ; then
39 +if test "$TAPE_ADDR_TYPE" = "" ; then
40 addr_t="unsigned int"
41 else
42 addr_t="$TAPE_ADDR_TYPE"
43 @@ -382,22 +382,22 @@ fi
44 AC_SUBST(cppad_tape_addr_type, [$addr_t])
45 AC_MSG_RESULT([$addr_t])
46 ok="no"
47 -if test "$addr_t" == "size_t" ; then
48 +if test "$addr_t" = "size_t" ; then
49 ok="yes"
50 fi
51 -if test "$addr_t" == "int" ; then
52 +if test "$addr_t" = "int" ; then
53 AC_MSG_WARN(
54 [TAPE_ADDR_TYPE=int is for CppAD developers (not users)]
55 )
56 ok="yes"
57 fi
58 -if test "$addr_t" == "unsigned int" ; then
59 +if test "$addr_t" = "unsigned int" ; then
60 ok="yes"
61 fi
62 -if test "$addr_t" == "unsigned short int" ; then
63 +if test "$addr_t" = "unsigned short int" ; then
64 ok="yes"
65 fi
66 -if test "$ok" == "no" ; then
67 +if test "$ok" = "no" ; then
68 AC_MSG_ERROR(
69 [$addr_t is not a valid choice for TAPE_ADDR_TYPE]
70 )
71 @@ -406,7 +406,7 @@ fi
72 dnl type used for tape identifier [ default = unsigned int ] -----------
73 AC_MSG_CHECKING([TAPE_ID_TYPE])
74 AC_ARG_VAR(TAPE_ID_TYPE, [type used for addresses in AD tapes])
75 -if test "$TAPE_ID_TYPE" == "" ; then
76 +if test "$TAPE_ID_TYPE" = "" ; then
77 tape_id_t="unsigned int"
78 else
79 tape_id_t="$TAPE_ID_TYPE"
80 @@ -414,22 +414,22 @@ fi
81 AC_SUBST(cppad_tape_id_type, [$tape_id_t])
82 AC_MSG_RESULT([$tape_id_t])
83 ok="no"
84 -if test "$tape_id_t" == "size_t" ; then
85 +if test "$tape_id_t" = "size_t" ; then
86 ok="yes"
87 fi
88 -if test "$tape_id_t" == "int" ; then
89 +if test "$tape_id_t" = "int" ; then
90 AC_MSG_WARN(
91 [TAPE_ID_TYPE=int is for CppAD developers (not users)]
92 )
93 ok="yes"
94 fi
95 -if test "$tape_id_t" == "unsigned int" ; then
96 +if test "$tape_id_t" = "unsigned int" ; then
97 ok="yes"
98 fi
99 -if test "$tape_id_t" == "unsigned short int" ; then
100 +if test "$tape_id_t" = "unsigned short int" ; then
101 ok="yes"
102 fi
103 -if test "$ok" == "no" ; then
104 +if test "$ok" = "no" ; then
105 AC_MSG_ERROR(
106 [$tape_id_t is not a valid choice for TAPE_ID_TYPE]
107 )
108 @@ -447,7 +447,7 @@ AC_SUBST(cppad_has_rvalue, 0)
109 dnl Determine if size_t has same size as unsigned int
110 AC_CHECK_SIZEOF([size_t])
111 AC_CHECK_SIZEOF([unsigned int])
112 -if test "$ac_cv_size_t" == "$ac_cv_unsigned_int" ; then
113 +if test "$ac_cv_size_t" = "$ac_cv_unsigned_int" ; then
114 AC_SUBST(cppad_size_t_same_unsigned_int, 1)
115 else
116 AC_SUBST(cppad_size_t_same_unsigned_int, 0)
117 @@ -485,8 +485,8 @@ AC_PROG_RANLIB
118 dnl AC_PROG_CXX([compiler-search-list]) outputs CXX as C++ compiler to use
119 AC_PROG_CXX
120 AC_MSG_CHECKING([whether using Microsoft C++ compiler])
121 -AM_CONDITIONAL(CppAD_MS_COMPILER, test "$CXX" == "cl" || test "$CXX" == "icl")
122 -if test "$CXX" == "cl" || test "$CXX" == "icl"; then
123 +AM_CONDITIONAL(CppAD_MS_COMPILER, test "$CXX" = "cl" || test "$CXX" = "icl")
124 +if test "$CXX" = "cl" || test "$CXX" = "icl"; then
125 AC_MSG_RESULT([yes])
126 else
127 AC_MSG_RESULT([no])
128 @@ -531,7 +531,7 @@ AC_CHECK_LIB(
129 [pthread="no"]
130 )
131 AM_CONDITIONAL(CppAD_PTHREAD, test "$pthread" = "yes")
132 -if test "$pthread" == "yes" ; then
133 +if test "$pthread" = "yes" ; then
134 AC_SUBST(PTHREAD_LIB,"-lpthread")
135 else
136 AC_SUBST(PTHREAD_LIB,"")
137 @@ -554,7 +554,7 @@ boost_thread_found='no'
138 if test "$BOOST_DIR" != '' ; then
139 CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
140 fi
141 -if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
142 +if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
143 bthread_lib='-lboost_thread-mt'
144 LDFLAGS="$LDFLAGS_save $bthread_lib"
145 AC_LINK_IFELSE(
146 @@ -566,7 +566,7 @@ if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
147 [boost_thread_found='no']
148 )
149 fi
150 -if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
151 +if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
152 bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
153 LDFLAGS="$LDFLAGS_save $bthread_lib"
154 AC_LINK_IFELSE(
155 @@ -578,7 +578,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
156 [boost_thread_found='no']
157 )
158 fi
159 -if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
160 +if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
161 bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
162 LDFLAGS="$LDFLAGS_save $bthread_lib"
163 AC_LINK_IFELSE(
164 @@ -590,7 +590,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
165 [boost_thread_found='no']
166 )
167 fi
168 -if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
169 +if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
170 bthread_lib='-lboost_thread'
171 LDFLAGS="$LDFLAGS_save $bthread_lib"
172 AC_LINK_IFELSE(
173 @@ -602,7 +602,7 @@ if test "$BOOST_DIR" == '' && test "$boost_thread_found" == 'no' ; then
174 [boost_thread_found='no']
175 )
176 fi
177 -if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
178 +if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
179 bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
180 LDFLAGS="$LDFLAGS_save $bthread_lib"
181 AC_LINK_IFELSE(
182 @@ -614,7 +614,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
183 [boost_thread_found='no']
184 )
185 fi
186 -if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
187 +if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
188 bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
189 LDFLAGS="$LDFLAGS_save $bthread_lib"
190 AC_LINK_IFELSE(
191 @@ -627,7 +627,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" == 'no' ; then
192 )
193 fi
194 AM_CONDITIONAL(CppAD_BTHREAD, test "$boost_thread_found" = 'yes')
195 -if test "$boost_thread_found" == 'yes' ; then
196 +if test "$boost_thread_found" = 'yes' ; then
197 AC_SUBST(BTHREAD_LIB,"$bthread_lib")
198 AC_MSG_RESULT([boost::thread library... yes])
199 else
200 @@ -650,12 +650,12 @@ fi
201 AC_SUBST(CPPAD_IPOPT_LD_PATH, "$IPOPT_LD_PATH")
202 #
203 AC_SUBST(CPPAD_IPOPT_LIBS, "$IPOPT_LIBS -lipopt")
204 -if test "$have_pkg_config" == "yes"; then
205 +if test "$have_pkg_config" = "yes"; then
206 dnl set CPPAD_IPOPT_LIBS
207 PKG_CONFIG_PATH="$IPOPT_DIR/lib/pkgconfig:$IPOPT_DIR/share/pkgconfig"
208 PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$IPOPT_DIR/lib64/pkgconfig"
209 export PKG_CONFIG_PATH
210 - if pkg-config --libs ipopt >& /dev/null ; then
211 + if pkg-config --libs ipopt > /dev/null 2>&1 ; then
212 CPPAD_IPOPT_LIBS=`pkg-config --libs ipopt`
213 else
214 dnl check for blas library
215 @@ -696,7 +696,7 @@ dnl
216 AC_SUBST(cppad_description, "Differentiation of C++ Algorithms")
217 AC_SUBST(cppad_version, ${PACKAGE_VERSION} )
218 AC_SUBST(cppad_url, "http://www.coin-or.org/CppAD")
219 -if test "$prefix" == "NONE" ; then
220 +if test "$prefix" = "NONE" ; then
221 cppad_cflags_value="-I$HOME/include"
222 cppad_libs_value="-L$HOME/lib"
223 else
224 @@ -707,7 +707,7 @@ if test "$POSTFIX_DIR" != "" ; then
225 cppad_cflags_value="$cppad_cflags_value/$POSTFIX_DIR"
226 cppad_libs_value="$cppad_libs_value/$POSTFIX_DIR"
227 fi
228 -if test "$IPOPT_DIR" == "" ; then
229 +if test "$IPOPT_DIR" = "" ; then
230 cppad_libs_value=""
231 cppad_requires_value=""
232 else
233
234
235
236 1.1 sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch
237
238 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch?rev=1.1&view=markup
239 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/coinor-cppad/files/coinor-cppad-20140519-boost.patch?rev=1.1&content-type=text/plain
240
241 Index: coinor-cppad-20140519-boost.patch
242 ===================================================================
243 configure.ac | 18 ++++++++++--------
244 1 file changed, 10 insertions(+), 8 deletions(-)
245
246 diff --git a/configure.ac b/configure.ac
247 index 033621f..87e129a 100644
248 --- a/configure.ac
249 +++ b/configure.ac
250 @@ -550,13 +550,14 @@ dnl check for boost thread library
251 AC_LANG_PUSH([C++])
252 LDFLAGS_save=$LDFLAGS
253 CXXFLAGS_save=$CXXFLAGS
254 +LIBS_save=$LIBS
255 boost_thread_found='no'
256 if test "$BOOST_DIR" != '' ; then
257 CXXFLAGS="-I$BOOST_DIR/include $CXXFLAGS"
258 fi
259 if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
260 - bthread_lib='-lboost_thread-mt'
261 - LDFLAGS="$LDFLAGS_save $bthread_lib"
262 + bthread_lib='-lboost_thread-mt -lboost_system'
263 + LIBS="$LIBS_save $bthread_lib"
264 AC_LINK_IFELSE(
265 [AC_LANG_PROGRAM(
266 [# include <boost/thread.hpp>],
267 @@ -568,7 +569,7 @@ if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
268 fi
269 if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
270 bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.so"
271 - LDFLAGS="$LDFLAGS_save $bthread_lib"
272 + LIBS="$LIBS_save $bthread_lib"
273 AC_LINK_IFELSE(
274 [AC_LANG_PROGRAM(
275 [# include <boost/thread.hpp>],
276 @@ -580,7 +581,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
277 fi
278 if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
279 bthread_lib="$BOOST_DIR/lib/libboost_thread-mt.a"
280 - LDFLAGS="$LDFLAGS_save $bthread_lib"
281 + LIBS="$LIBS_save $bthread_lib"
282 AC_LINK_IFELSE(
283 [AC_LANG_PROGRAM(
284 [# include <boost/thread.hpp>],
285 @@ -591,8 +592,8 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
286 )
287 fi
288 if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
289 - bthread_lib='-lboost_thread'
290 - LDFLAGS="$LDFLAGS_save $bthread_lib"
291 + bthread_lib='-lboost_thread -lboost_system'
292 + LIBS="$LIBS_save $bthread_lib"
293 AC_LINK_IFELSE(
294 [AC_LANG_PROGRAM(
295 [# include <boost/thread.hpp>],
296 @@ -604,7 +605,7 @@ if test "$BOOST_DIR" = '' && test "$boost_thread_found" = 'no' ; then
297 fi
298 if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
299 bthread_lib="$BOOST_DIR/lib/libboost_thread.so"
300 - LDFLAGS="$LDFLAGS_save $bthread_lib"
301 + LIBS="$LIBS_save $bthread_lib"
302 AC_LINK_IFELSE(
303 [AC_LANG_PROGRAM(
304 [# include <boost/thread.hpp>],
305 @@ -616,7 +617,7 @@ if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
306 fi
307 if test "$BOOST_DIR" != '' && test "$boost_thread_found" = 'no' ; then
308 bthread_lib="$BOOST_DIR/lib/libboost_thread.a"
309 - LDFLAGS="$LDFLAGS_save $bthread_lib"
310 + LIBS="$LIBS_save $bthread_lib"
311 AC_LINK_IFELSE(
312 [AC_LANG_PROGRAM(
313 [# include <boost/thread.hpp>],
314 @@ -636,6 +637,7 @@ else
315 fi
316 LDFLAGS=$LDFLAGS_save
317 CXXFLAGS=$CXXFLAGS_save
318 +LIBS=$LIBS_save
319 AC_LANG_POP([C++])
320 #
321 dnl --------------------------------------------------------------------------
Report Message
Find on MARC Find on Google Groups