[gentoo-commits] repo/proj/guru:dev commit in: gui-libs/cubegui/
commit: ebac0e1295ed4636e5bed92e80374f4a87718405
Author: Alessandro Barbieri gmail com>
AuthorDate: Wed Jul 6 00:09:35 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Wed Jul 6 00:10:29 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ebac0e12
gui-libs/cubegui: new unreleased version
Closes: https://bugs.gentoo.org/855218
Signed-off-by: Alessandro Barbieri gmail.com>
gui-libs/cubegui/Manifest | 2 +-
.../cubegui/{cubegui-4.7.ebuild => cubegui-4.7-r1.ebuild} | 14 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/gui-libs/cubegui/Manifest b/gui-libs/cubegui/Manifest
index d48443b77..2ba0282af 100644
--- a/gui-libs/cubegui/Manifest
+++ b/gui-libs/cubegui/Manifest
@@ -1 +1 @@
-DIST cubegui-4.7.tar.gz 10789553 BLAKE2B
b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a
SHA512
48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9
+DIST cubegui-4.7-9a161bfd.tar.gz 10696455 BLAKE2B
0f7a2c2af3dfbba3b0f505901f7b1efaea6b327bb7e88ee116a8774454f8b246ce01e732be28f2922b58320b2429b2988bed79e0af70e8b788ff7a638802d62c
SHA512
ee22fdb7ffddcb9033e729a54ff3009baadc3774bb4434b890aac3527e62644af5a3ab89211a8d40eb6e754b7074b504e62bb711304d4388129a75962fae0743
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild
b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
similarity index 90%
rename from gui-libs/cubegui/cubegui-4.7.ebuild
rename to gui-libs/cubegui/cubegui-4.7-r1.ebuild
index 00067af6a..5e8ec0bed 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
@@ -5,9 +5,13 @@ EAPI=8
inherit bash-completion-r1 qmake-utils toolchain-funcs
+MYPV="9a161bfd"
+MYP="sources.${MYPV}"
+
DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x;
-SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz;
+SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/${PN}/branches/master/${MYP}.tar.gz
-> ${P}-${MYPV}.tar.gz"
+S="${WORKDIR}/${MYP}"
LICENSE="BSD"
SLOT="0"
@@ -31,9 +35,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="app-doc/doxygen[dot]"
-PATCHES=(
- "${FILESDIR}/${P}-custom-compiler.patch"
-)
+# reconfigure needs custom autotools
src_configure() {
tc-export CC CXX FC F77 CPP AR
@@ -74,10 +76,6 @@ src_configure() {
MPI_LDFLAGS=${LDFLAGS}
EOF
- export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network
-lQt5Core"
- use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
- use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
-
local myconf=(
--disable-platform-mic
--with-cubelib="${EPREFIX}/usr"
[gentoo-commits] repo/proj/guru:dev commit in: gui-libs/cubegui/, gui-libs/cubegui/files/
commit: 8a5b37df3bc0257f6494749a189f372a09392f91
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Jun 23 02:22:36 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sun Jun 26 02:29:44 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8a5b37df
gui-libs/cubegui: fix QT build
Signed-off-by: Alessandro Barbieri gmail.com>
gui-libs/cubegui/cubegui-4.7.ebuild| 15 +-
gui-libs/cubegui/files/cubegui-4.7-autotroll.patch | 32 ---
.../files/cubegui-4.7-custom-compiler.patch| 304 +
3 files changed, 309 insertions(+), 42 deletions(-)
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild
b/gui-libs/cubegui/cubegui-4.7.ebuild
index f77b38c89..00067af6a 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools bash-completion-r1 qmake-utils toolchain-funcs
+inherit bash-completion-r1 qmake-utils toolchain-funcs
DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x;
@@ -31,15 +31,9 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="app-doc/doxygen[dot]"
-PATCHES=( "${FILESDIR}/${P}-autotroll.patch" )
-
-src_prepare() {
- default
- pushd build-frontend || die
- eautoreconf
- popd || die
- eautoreconf
-}
+PATCHES=(
+ "${FILESDIR}/${P}-custom-compiler.patch"
+)
src_configure() {
tc-export CC CXX FC F77 CPP AR
@@ -106,6 +100,7 @@ src_configure() {
--with-plugin-treeitem-marker
--with-plugin-vampir
--with-qt="$(qt5_get_bindir)"
+ --with-qt-specs="$(qmake5 -query QMAKE_SPEC || die)"
$(use_enable debug)
$(use_with concurrent)
diff --git a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
b/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
deleted file mode 100644
index fe3a5f7d0..0
--- a/gui-libs/cubegui/files/cubegui-4.7-autotroll.patch
+++ /dev/null
@@ -1,32 +0,0 @@
a/build-config/m4/autotroll.m4
-+++ b/build-config/m4/autotroll.m4
-@@ -742,29 +742,6 @@
- # | sed -e "s,-lQt,-L${QT_PATH}/../lib -lQt,g"`
- ])
-
-- echo "Adjust Qt libraries list to the cannonical one"
-- # replace list of .so files by the -l libraries
-- AS_IF([ test "x$QT_PATH" != "x" ],
-- [
--LIBPATH=`echo $QT_PATH | sed "s,/bin,,g"`"/lib"
-- ],
-- [ # in case of standard installation -> path to the libraries is encoded in
the path to .so libraries
--for i in $at_cv_env_QT_LIBS; do
--_LIBPATH=`echo $i | grep '.so'`
--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)
--[
--LIBPATH=$(dirname $_LIBPATH)
--break
--])
--
--done
-- ])
--AS_IF([ test "x$LIBPATH" != "x" ], # perform correction only if one has
found .so libraries instead of -l
--[
-- 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"`
-- echo "Fixed libraries are: $at_cv_env_QT_LIBS"
--])
-- AC_SUBST([QT_LIBS], [$at_cv_env_QT_LIBS])
-
-
- # Find the Compiler of Qt (Should have been named )
diff --git a/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
new file mode 100644
index 0..ca890e923
--- /dev/null
+++ b/gui-libs/cubegui/files/cubegui-4.7-custom-compiler.patch
@@ -0,0 +1,304 @@
+--- a/configure
b/configure
+@@ -5042,6 +5042,7 @@
+ fi
+
+
++
+ if test ! -n "$ac_scorep_platform_data_provided" || \
+test "x${ac_scorep_platform_data_provided}" = "xno"; then :
+
+@@ -6528,17 +6529,137 @@
+
+ QT_CXX=`basename $at_cv_env_QT_CXX`
+
+- case $QT_CXX in #(
+- "g++") :
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler
vendor" >&5
++$as_echo_n "checking for C++ compiler vendor... " >&6; }
++if ${ax_cv_cxx_compiler_vendor+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++
++ vendors="
++ intel: __ICC,__ECC,__INTEL_COMPILER
++ ibm:
__xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__
++ pathscale: __PATHCC__,__PATHSCALE__
++ clang: __clang__
++ cray: _CRAYC,_CRAYFTN
++ fujitsu:__FUJITSU
++ sdcc: SDCC,__SDCC
++ sx: _SX
++ portland: __PGI
++ flang: __flang__,__PGLLVM__
++ gnu:__GNUC__
[gentoo-commits] repo/proj/guru:dev commit in: gui-libs/cubegui/
commit: d4c3438626078c2dfa37328e04ef4c9e849ef965
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Jun 16 14:16:54 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Fri Jun 17 00:35:49 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d4c34386
gui-libs/cubegui: export more variables
Bug: https://bugs.gentoo.org/852032
Signed-off-by: Alessandro Barbieri gmail.com>
gui-libs/cubegui/cubegui-4.7.ebuild | 45 +
1 file changed, 41 insertions(+), 4 deletions(-)
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild
b/gui-libs/cubegui/cubegui-4.7.ebuild
index 52c97f63c..f77b38c89 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools bash-completion-r1 qmake-utils
+inherit autotools bash-completion-r1 qmake-utils toolchain-funcs
DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x;
@@ -42,8 +42,44 @@ src_prepare() {
}
src_configure() {
- export CC=gcc
- export CXX=g++
+ tc-export CC CXX FC F77 CPP AR
+ rm build-config/common/platforms/platform-* || die
+
+ cat > build-config/common/platforms/platform-backend-user-provided
<<-EOF || die
+ CC=${CC}
+ CXX=${CXX}
+ FC=${FC}
+ F77=${F77}
+ CPP=${CPP}
+ CXXCPP=${CPP}
+ EOF
+
+ cat > build-config/common/platforms/platform-frontend-user-provided
<<-EOF || die
+ CC_FOR_BUILD=${CC}
+ F77_FOR_BUILD=${F77}
+ FC_FOR_BUILD=${FC}
+ CXX_FOR_BUILD=${CXX}
+ LDFLAGS_FOR_BUILD=${LDFLAGS}
+ CFLAGS_FOR_BUILD=${CFLAGS}
+ CXXFLAGS_FOR_BUILD=${CXXFLAGS}
+ CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+ FCFLAGS_FOR_BUILD=${FCFLAGS}
+ FFLAGS_FOR_BUILD=${FFLAGS}
+ EOF
+
+ cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF
|| die
+ MPICC=mpicc
+ MPICXX=mpicxx
+ MPIF77=mpif77
+ MPIFC=mpif90
+ MPI_CPPFLAGS=${CPPFLAGS}
+ MPI_CFLAGS=${CFLAGS}
+ MPI_CXXFLAGS=${CXXFLAGS}
+ MPI_FFLAGS=${FFLAGS}
+ MPI_FCFLAGS=${FCFLAGS}
+ MPI_LDFLAGS=${LDFLAGS}
+ EOF
+
export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network
-lQt5Core"
use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
@@ -51,6 +87,7 @@ src_configure() {
local myconf=(
--disable-platform-mic
--with-cubelib="${EPREFIX}/usr"
+ --with-custom-compilers
--with-plugin-advancedcolormaps
--with-plugin-barplot
--with-plugin-cube-diff
@@ -81,7 +118,7 @@ src_configure() {
myconf+=( "--without-scorep" )
fi
- econf "${myconf[@]}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" "${myconf[@]}"
+ econf "${myconf[@]}"
}
src_install() {
[gentoo-commits] repo/proj/guru:dev commit in: gui-libs/cubegui/files/, gui-libs/cubegui/
commit: be76feda3f14ec9c4bf9e2ad6dda0a386d14f4b9
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Jun 14 01:48:37 2022 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue Jun 14 08:00:25 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be76feda
gui-libs/cubegui: new package, add 4.7
Signed-off-by: Alessandro Barbieri gmail.com>
gui-libs/cubegui/Manifest | 1 +
gui-libs/cubegui/cubegui-4.7.ebuild| 104 +
gui-libs/cubegui/files/cubegui-4.7-autotroll.patch | 32 +++
gui-libs/cubegui/metadata.xml | 13 +++
4 files changed, 150 insertions(+)
diff --git a/gui-libs/cubegui/Manifest b/gui-libs/cubegui/Manifest
new file mode 100644
index 0..d48443b77
--- /dev/null
+++ b/gui-libs/cubegui/Manifest
@@ -0,0 +1 @@
+DIST cubegui-4.7.tar.gz 10789553 BLAKE2B
b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a
SHA512
48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild
b/gui-libs/cubegui/cubegui-4.7.ebuild
new file mode 100644
index 0..52c97f63c
--- /dev/null
+++ b/gui-libs/cubegui/cubegui-4.7.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 qmake-utils
+
+DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
+HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x;
+SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="concurrent debug scorep webengine"
+
+RDEPEND="
+ concurrent? ( dev-qt/qtconcurrent:5 )
+ scorep? ( sys-cluster/scorep )
+ webengine? ( dev-qt/qtwebengine:5 )
+
+ dev-libs/cubelib
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ sys-apps/dbus
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/doxygen[dot]"
+
+PATCHES=( "${FILESDIR}/${P}-autotroll.patch" )
+
+src_prepare() {
+ default
+ pushd build-frontend || die
+ eautoreconf
+ popd || die
+ eautoreconf
+}
+
+src_configure() {
+ export CC=gcc
+ export CXX=g++
+ export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network
-lQt5Core"
+ use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
+ use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
+
+ local myconf=(
+ --disable-platform-mic
+ --with-cubelib="${EPREFIX}/usr"
+ --with-plugin-advancedcolormaps
+ --with-plugin-barplot
+ --with-plugin-cube-diff
+ --with-plugin-cube-mean
+ --with-plugin-cube-merge
+ --with-plugin-heatmap
+ --with-plugin-launch
+ --with-plugin-metric-identify
+ --with-plugin-metriceditor
+ --with-plugin-source
+ --with-plugin-statistics
+ --with-plugin-paraver
+ --with-plugin-sunburst
+ --with-plugin-system-statistics
+ --with-plugin-system-topology
+ --with-plugin-treeitem-marker
+ --with-plugin-vampir
+ --with-qt="$(qt5_get_bindir)"
+
+ $(use_enable debug)
+ $(use_with concurrent)
+ $(use_with scorep plugin-scorep-config)
+ $(use_with webengine web-engine)
+ )
+ if use scorep; then
+ myconf+=( "--with-scorep=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-scorep" )
+ fi
+
+ econf "${myconf[@]}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" "${myconf[@]}"
+}
+
+src_install() {
+ MAKEOPTS="-j1" default
+ mkdir -p "${ED}/usr/share/doc/${PF}/html"
+ mv "${ED}/usr/share/doc/${PF}/guide/html"
"${ED}/usr/share/doc/${PF}/html/guide" || die
+ mv "${ED}/usr/share/doc/${PF}/plugins-guide/html"
"${ED}/usr/share/doc/${PF}/html/plugins-guide" || die
+ rm -rf "${ED}/usr/share/doc/${PF}/guide" || die
+ rm -rf "${ED}/usr/share/doc/${PF}/plugins-guide" || die
+ docompress -x "/usr/share/doc/${PF}/html"
+ mv "${ED}/usr/share/doc/cubegui/example"
"${ED}/usr/share/doc/${PF}/examples" || die
+ docompress -x "/usr/share/doc/${PF}/examples"
+ rm -rf "${ED}/usr/share/doc/cubegui" || die
+
+ newbashcomp "${ED}/usr/bin/cubegui-autocompletion.sh" cubegui
+ rm -r "${ED}/usr/bin/cubegui-autocompletion.sh" || die
+
+ find "${ED}" -name '*.a' -delete || die
+ find "${ED}" -name '*.la' -delete ||
