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

Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-libs/cubegui/, gui-libs/cubegui/files/
Date: Sun, 26 Jun 2022 02:36:45
Message-Id: 1656210584.8a5b37df3bc0257f6494749a189f372a09392f91.Alessandro-Barbieri@gentoo
1 commit: 8a5b37df3bc0257f6494749a189f372a09392f91
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Thu Jun 23 02:22:36 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun Jun 26 02:29:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8a5b37df
7
8 gui-libs/cubegui: fix QT build
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 gui-libs/cubegui/cubegui-4.7.ebuild | 15 +-
13 gui-libs/cubegui/files/cubegui-4.7-autotroll.patch | 32 ---
14 .../files/cubegui-4.7-custom-compiler.patch | 304 +++++++++++++++++++++
15 3 files changed, 309 insertions(+), 42 deletions(-)
16
17 diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild b/gui-libs/cubegui/cubegui-4.7.ebuild
18 index f77b38c89..00067af6a 100644
19 --- a/gui-libs/cubegui/cubegui-4.7.ebuild
20 +++ b/gui-libs/cubegui/cubegui-4.7.ebuild
21 @@ -3,7 +3,7 @@
22
23 EAPI=8
24
25 -inherit autotools bash-completion-r1 qmake-utils toolchain-funcs
26 +inherit bash-completion-r1 qmake-utils toolchain-funcs
27
28 DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
29 HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
30 @@ -31,15 +31,9 @@ RDEPEND="
31 DEPEND="${RDEPEND}"
32 BDEPEND="app-doc/doxygen[dot]"
33
34 -PATCHES=( "${FILESDIR}/${P}-autotroll.patch" )
35 -
36 -src_prepare() {
37 - default
38 - pushd build-frontend || die
39 - eautoreconf
40 - popd || die
41 - eautoreconf
42 -}
43 +PATCHES=(
44 + "${FILESDIR}/${P}-custom-compiler.patch"
45 +)
46
47 src_configure() {
48 tc-export CC CXX FC F77 CPP AR
49 @@ -106,6 +100,7 @@ src_configure() {
50 --with-plugin-treeitem-marker
51 --with-plugin-vampir
52 --with-qt="$(qt5_get_bindir)"
53 + --with-qt-specs="$(qmake5 -query QMAKE_SPEC || die)"
54
55 $(use_enable debug)
56 $(use_with concurrent)
57
58 diff --git a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch b/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
59 deleted file mode 100644
60 index fe3a5f7d0..000000000
61 --- a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
62 +++ /dev/null
63 @@ -1,32 +0,0 @@
64 ---- a/build-config/m4/autotroll.m4
65 -+++ b/build-config/m4/autotroll.m4
66 -@@ -742,29 +742,6 @@
67 - # | sed -e "s,-lQt,-L${QT_PATH}/../lib -lQt,g"`
68 - ])
69 -
70 -- echo "Adjust Qt libraries list to the cannonical one"
71 -- # replace list of .so files by the -l libraries
72 -- AS_IF([ test "x$QT_PATH" != "x" ],
73 -- [
74 -- LIBPATH=`echo $QT_PATH | sed "s,/bin,,g"`"/lib"
75 -- ],
76 -- [ # in case of standard installation -> path to the libraries is encoded in the path to .so libraries
77 -- for i in $at_cv_env_QT_LIBS; do
78 -- _LIBPATH=`echo $i | grep '.so'`
79 -- AS_IF([ test "x$_LIBPATH" != "x" ], # test if the path has been line .so , other wise try the next one... (for the case of list -l... libraries)
80 -- [
81 -- LIBPATH=$(dirname $_LIBPATH)
82 -- break
83 -- ])
84 --
85 -- done
86 -- ])
87 --AS_IF([ test "x$LIBPATH" != "x" ], # perform correction only if one has found .so libraries instead of -lXXXX
88 --[
89 -- at_cv_env_QT_LIBS="-L$LIBPATH "`echo $at_cv_env_QT_LIBS | sed "s,.so , ,g;s,.a , ,g;s,$LIBPATH/lib,-l,g;s,$(readlink -m $LIBPATH)/lib,-l,g"`
90 -- echo "Fixed libraries are: $at_cv_env_QT_LIBS"
91 --])
92 -- AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
93 -
94 -
95 - # Find the Compiler of Qt (Should have been named )
96
97 diff --git a/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
98 new file mode 100644
99 index 000000000..ca890e923
100 --- /dev/null
101 +++ b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
102 @@ -0,0 +1,304 @@
103 +--- a/configure
104 ++++ b/configure
105 +@@ -5042,6 +5042,7 @@
106 + fi
107 +
108 +
109 ++
110 + if test ! -n "$ac_scorep_platform_data_provided" || \
111 + test "x${ac_scorep_platform_data_provided}" = "xno"; then :
112 +
113 +@@ -6528,17 +6529,137 @@
114 +
115 + QT_CXX=`basename $at_cv_env_QT_CXX`
116 +
117 +- case $QT_CXX in #(
118 +- "g++") :
119 ++ ac_ext=cpp
120 ++ac_cpp='$CXXCPP $CPPFLAGS'
121 ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
122 ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
123 ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
124 ++
125 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler vendor" >&5
126 ++$as_echo_n "checking for C++ compiler vendor... " >&6; }
127 ++if ${ax_cv_cxx_compiler_vendor+:} false; then :
128 ++ $as_echo_n "(cached) " >&6
129 ++else
130 ++
131 ++ vendors="
132 ++ intel: __ICC,__ECC,__INTEL_COMPILER
133 ++ ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__
134 ++ pathscale: __PATHCC__,__PATHSCALE__
135 ++ clang: __clang__
136 ++ cray: _CRAYC,_CRAYFTN
137 ++ fujitsu: __FUJITSU
138 ++ sdcc: SDCC,__SDCC
139 ++ sx: _SX
140 ++ portland: __PGI
141 ++ flang: __flang__,__PGLLVM__
142 ++ gnu: __GNUC__
143 ++ sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
144 ++ hp: __HP_cc,__HP_aCC
145 ++ dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
146 ++ borland: __BORLANDC__,__CODEGEARC__,__TURBOC__
147 ++ comeau: __COMO__
148 ++ kai: __KCC
149 ++ lcc: __LCC__
150 ++ sgi: __sgi,sgi
151 ++ microsoft: _MSC_VER
152 ++ metrowerks: __MWERKS__
153 ++ watcom: __WATCOMC__
154 ++ tcc: __TINYC__
155 ++ unknown: UNKNOWN
156 ++ "
157 ++ for ventest in $vendors; do
158 ++ case $ventest in #(
159 ++ *:)
160 ++ vendor=${ventest%:*}
161 ++ continue
162 ++ ;; #(
163 ++ *)
164 ++ vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
165 ++ ;;
166 ++ esac
167 ++
168 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
169 ++/* end confdefs.h. */
170 ++
171 ++int
172 ++main ()
173 ++{
174 ++
175 ++#if !($vencpp)
176 ++ thisisanerror;
177 ++#endif
178 ++
179 ++ ;
180 ++ return 0;
181 ++}
182 ++_ACEOF
183 ++if ac_fn_cxx_try_compile "$LINENO"; then :
184 ++ break
185 ++fi
186 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
187 ++ done
188 ++
189 ++ ax_cv_cxx_compiler_vendor=$vendor
190 ++
191 ++ flang_variants="classic: __PGLLVM__"
192 ++ portland_variants="llvm: __PGLLVM__"
193 ++ eval variants=\"\$${ax_cv_cxx_compiler_vendor}_variants : NONE\"
194 ++ for vartest in $variants; do
195 ++ case $vartest in #(
196 ++ *:)
197 ++ variant=${vartest%:*};
198 ++ continue
199 ++ ;; #(
200 ++ *)
201 ++ varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")"
202 ++ ;;
203 ++ esac
204 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
205 ++/* end confdefs.h. */
206 ++
207 ++int
208 ++main ()
209 ++{
210 ++
211 ++#if !($varcpp)
212 ++ thisisanerror;
213 ++#endif
214 ++
215 ++ ;
216 ++ return 0;
217 ++}
218 ++_ACEOF
219 ++if ac_fn_cxx_try_compile "$LINENO"; then :
220 ++ break
221 ++fi
222 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
223 ++ done
224 ++ as_fn_append ax_cv_cxx_compiler_vendor ${variant:+/$variant}
225 ++
226 ++fi
227 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compiler_vendor" >&5
228 ++case "$ax_cv_cxx_compiler_vendor" in #(
229 ++ yes|ok|yes[\ ,]*) :
230 ++ $as_echo "${as__grn}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
231 ++ no|failed|unsupported|no[\ ,]*) :
232 ++ $as_echo "${as__red}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
233 ++ *) :
234 ++ $as_echo "${as__blu}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;;
235 ++esac; }
236 ++
237 ++ ac_ext=c
238 ++ac_cpp='$CPP $CPPFLAGS'
239 ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
240 ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
241 ++ac_compiler_gnu=$ac_cv_c_compiler_gnu
242 ++
243 ++ case ${ax_cv_cxx_compiler_vendor%/*} in #(
244 ++ gnu) :
245 + qt_compiler="gcc" ;; #(
246 +- "xlC") :
247 +- qt_compiler="ibm" ;; #(
248 +- "clang++") :
249 ++ clang) :
250 + qt_compiler="clang" ;; #(
251 +- "icpc") :
252 ++ intel) :
253 + qt_compiler="intel" ;; #(
254 +- "openCC") :
255 +- qt_compiler="open64" ;; #(
256 + *) :
257 + as_fn_error $? "Qt compiler \"${QT_CXX}\" is not supported by --with-frontend-compiler-suite." "$LINENO" 5 ;;
258 + esac
259 +--- a/build-frontend/configure
260 ++++ b/build-frontend/configure
261 +@@ -22090,17 +22090,137 @@
262 +
263 + QT_CXX=`basename $at_cv_env_QT_CXX`
264 +
265 +- case $QT_CXX in #(
266 +- "g++") :
267 ++ ac_ext=cpp
268 ++ac_cpp='$CXXCPP $CPPFLAGS'
269 ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
270 ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
271 ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
272 ++
273 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler vendor" >&5
274 ++$as_echo_n "checking for C++ compiler vendor... " >&6; }
275 ++if ${ax_cv_cxx_compiler_vendor+:} false; then :
276 ++ $as_echo_n "(cached) " >&6
277 ++else
278 ++
279 ++ vendors="
280 ++ intel: __ICC,__ECC,__INTEL_COMPILER
281 ++ ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__
282 ++ pathscale: __PATHCC__,__PATHSCALE__
283 ++ clang: __clang__
284 ++ cray: _CRAYC,_CRAYFTN
285 ++ fujitsu: __FUJITSU
286 ++ sdcc: SDCC,__SDCC
287 ++ sx: _SX
288 ++ portland: __PGI
289 ++ flang: __flang__,__PGLLVM__
290 ++ gnu: __GNUC__
291 ++ sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95
292 ++ hp: __HP_cc,__HP_aCC
293 ++ dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
294 ++ borland: __BORLANDC__,__CODEGEARC__,__TURBOC__
295 ++ comeau: __COMO__
296 ++ kai: __KCC
297 ++ lcc: __LCC__
298 ++ sgi: __sgi,sgi
299 ++ microsoft: _MSC_VER
300 ++ metrowerks: __MWERKS__
301 ++ watcom: __WATCOMC__
302 ++ tcc: __TINYC__
303 ++ unknown: UNKNOWN
304 ++ "
305 ++ for ventest in $vendors; do
306 ++ case $ventest in #(
307 ++ *:)
308 ++ vendor=${ventest%:*}
309 ++ continue
310 ++ ;; #(
311 ++ *)
312 ++ vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")"
313 ++ ;;
314 ++ esac
315 ++
316 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
317 ++/* end confdefs.h. */
318 ++
319 ++int
320 ++main ()
321 ++{
322 ++
323 ++#if !($vencpp)
324 ++ thisisanerror;
325 ++#endif
326 ++
327 ++ ;
328 ++ return 0;
329 ++}
330 ++_ACEOF
331 ++if ac_fn_cxx_try_compile "$LINENO"; then :
332 ++ break
333 ++fi
334 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
335 ++ done
336 ++
337 ++ ax_cv_cxx_compiler_vendor=$vendor
338 ++
339 ++ flang_variants="classic: __PGLLVM__"
340 ++ portland_variants="llvm: __PGLLVM__"
341 ++ eval variants=\"\$${ax_cv_cxx_compiler_vendor}_variants : NONE\"
342 ++ for vartest in $variants; do
343 ++ case $vartest in #(
344 ++ *:)
345 ++ variant=${vartest%:*};
346 ++ continue
347 ++ ;; #(
348 ++ *)
349 ++ varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")"
350 ++ ;;
351 ++ esac
352 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
353 ++/* end confdefs.h. */
354 ++
355 ++int
356 ++main ()
357 ++{
358 ++
359 ++#if !($varcpp)
360 ++ thisisanerror;
361 ++#endif
362 ++
363 ++ ;
364 ++ return 0;
365 ++}
366 ++_ACEOF
367 ++if ac_fn_cxx_try_compile "$LINENO"; then :
368 ++ break
369 ++fi
370 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
371 ++ done
372 ++ as_fn_append ax_cv_cxx_compiler_vendor ${variant:+/$variant}
373 ++
374 ++fi
375 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compiler_vendor" >&5
376 ++case "$ax_cv_cxx_compiler_vendor" in #(
377 ++ yes|ok|yes[\ ,]*) :
378 ++ $as_echo "${as__grn}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
379 ++ no|failed|unsupported|no[\ ,]*) :
380 ++ $as_echo "${as__red}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;; #(
381 ++ *) :
382 ++ $as_echo "${as__blu}$ax_cv_cxx_compiler_vendor${as__std}" >&6 ;;
383 ++esac; }
384 ++
385 ++ ac_ext=c
386 ++ac_cpp='$CPP $CPPFLAGS'
387 ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
388 ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
389 ++ac_compiler_gnu=$ac_cv_c_compiler_gnu
390 ++
391 ++ case ${ax_cv_cxx_compiler_vendor%/*} in #(
392 ++ gnu) :
393 + qt_compiler="gcc" ;; #(
394 +- "xlC") :
395 +- qt_compiler="ibm" ;; #(
396 +- "clang++") :
397 ++ clang) :
398 + qt_compiler="clang" ;; #(
399 +- "icpc") :
400 ++ intel) :
401 + qt_compiler="intel" ;; #(
402 +- "openCC") :
403 +- qt_compiler="open64" ;; #(
404 + *) :
405 + as_fn_error $? "Qt compiler \"${QT_CXX}\" is not supported by --with-frontend-compiler-suite." "$LINENO" 5 ;;
406 + esac
Report Message
Find on MARC Find on Google Groups