* [gentoo-commits] repo/proj/guru:master commit in: sys-power/geopmd/files/, sys-power/geopmd/
@ 2022-06-15 12:42 Andrew Ammerlaan
0 siblings, 0 replies; only message in thread
From: Andrew Ammerlaan @ 2022-06-15 12:42 UTC (permalink / raw
To: gentoo-commits
commit: 9d2fa7575de8de1b3e1e1498a5e3a3269c48fd86
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Jun 14 23:20:58 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 01:33:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d2fa757
sys-power/geopmd: new package, add 2.0.0_rc1
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-power/geopmd/Manifest | 1 +
.../geopmd/files/geopmd-2.0.0_rc1-no-Werror.patch | 13 ++++
.../files/geopmd-2.0.0_rc1-system-gtest.patch | 18 +++++
.../files/geopmd-2.0.0_rc1-system-json11.patch | 85 ++++++++++++++++++++++
sys-power/geopmd/geopmd-2.0.0_rc1.ebuild | 82 +++++++++++++++++++++
sys-power/geopmd/metadata.xml | 12 +++
6 files changed, 211 insertions(+)
diff --git a/sys-power/geopmd/Manifest b/sys-power/geopmd/Manifest
new file mode 100644
index 000000000..3dc70ea3b
--- /dev/null
+++ b/sys-power/geopmd/Manifest
@@ -0,0 +1 @@
+DIST geopm-2.0.0+rc1.gh.tar.gz 1154215 BLAKE2B 2e2026b6c038dab305bb63e27ccfc02114f03e289c8ccd6cc77b2d7b06679731ae28ece40f37b4f00892ec59b588a2d19c3f1563e05347e289e47054bef81a18 SHA512 906f1ba985e07cb36e562104e11129ea44eb25ee796b4780ad16bdb9fe050ef830b5adb87bfc678446a3ebfb744d162dfb0ea0d975f6fd5c1fc6cc77a21aefe1
diff --git a/sys-power/geopmd/files/geopmd-2.0.0_rc1-no-Werror.patch b/sys-power/geopmd/files/geopmd-2.0.0_rc1-no-Werror.patch
new file mode 100644
index 000000000..db37c011e
--- /dev/null
+++ b/sys-power/geopmd/files/geopmd-2.0.0_rc1-no-Werror.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -319,8 +319,8 @@
+
+ AC_LANG_POP([C++])
+
+-[EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall -Werror"]
+-[EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -Wall -Werror"]
++[EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"]
++[EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -Wall"]
+
+ [AM_CFLAGS="$EXTRA_CFLAGS $AM_CFLAGS"]
+ [AM_CXXFLAGS="$EXTRA_CXXFLAGS $AM_CXXFLAGS"]
diff --git a/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-gtest.patch b/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-gtest.patch
new file mode 100644
index 000000000..2edf39c3e
--- /dev/null
+++ b/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-gtest.patch
@@ -0,0 +1,18 @@
+--- a/test/Makefile.mk
++++ b/test/Makefile.mk
+@@ -422,8 +422,8 @@
+ # end
+
+ test_geopm_test_LDADD = libgeopmd.la \
+- libgmock.a \
+- libgtest.a \
++ -lgmock \
++ -lgtest \
+ # end
+
+ test_geopm_test_CPPFLAGS = $(AM_CPPFLAGS) -Iplugin
+@@ -453,4 +453,3 @@
+
+ CLEAN_LOCAL_TARGETS += clean-local-gtest-script-links
+
+-include test/googletest.mk
diff --git a/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-json11.patch b/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-json11.patch
new file mode 100644
index 000000000..100b86126
--- /dev/null
+++ b/sys-power/geopmd/files/geopmd-2.0.0_rc1-system-json11.patch
@@ -0,0 +1,85 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -30,7 +30,7 @@
+
+ geopmincludedir = $(includedir)/geopm
+
+-geopminclude_HEADERS = contrib/json11/json11.hpp \
++geopminclude_HEADERS = \
+ src/geopm/Agg.hpp \
+ src/geopm/CircularBuffer.hpp \
+ src/geopm/Exception.hpp \
+@@ -60,8 +60,6 @@
+ Makefile.am \
+ autogen.sh \
+ configure.ac \
+- contrib/json11/LICENSE.txt \
+- contrib/json11/README.md \
+ dox/blurb.md \
+ dox/Doxyfile.in \
+ geopm-service.spec.in \
+@@ -91,7 +89,6 @@
+ geopmsession \
+ requirements.txt \
+ setup.py \
+- src/geopm/json11.hpp \
+ geopm.service \
+ AUTHORS \
+ CODE_OF_CONDUCT.md \
+@@ -107,11 +104,9 @@
+
+ # Add ABI version
+ libgeopmd_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(geopm_abi_version)
+-
++libgeopmd_la_LIBADD = -ljson11
+ libgeopmd_la_SOURCES = $(include_HEADERS) \
+ $(geopminclude_HEADERS) \
+- contrib/json11/json11.cpp \
+- contrib/json11/json11.hpp \
+ src/GPUTopo.cpp \
+ src/GPUTopo.hpp \
+ src/GPUTopoNull.cpp \
+--- a/src/geopm/MSRIOGroup.hpp
++++ b/src/geopm/MSRIOGroup.hpp
+@@ -13,7 +13,7 @@
+ #include <string>
+ #include <set>
+
+-#include "geopm/json11.hpp"
++#include "json11.hpp"
+
+ #include "IOGroup.hpp"
+ #include "geopm_time.h"
+--- a/src/MSRIOGroup.cpp
++++ b/src/MSRIOGroup.cpp
+@@ -17,7 +17,7 @@
+ #include <iostream>
+ #include <set>
+
+-#include "geopm/json11.hpp"
++#include "json11.hpp"
+
+ #include "geopm_sched.h"
+ #include "geopm/Exception.hpp"
+--- a/src/SaveControl.cpp
++++ b/src/SaveControl.cpp
+@@ -7,7 +7,7 @@
+
+ #include "SaveControl.hpp"
+
+-#include "geopm/json11.hpp"
++#include "json11.hpp"
+ #include "geopm/Helper.hpp"
+ #include "geopm/Exception.hpp"
+ #include "geopm/IOGroup.hpp"
+--- a/test/MSRIOGroupTest.cpp
++++ b/test/MSRIOGroupTest.cpp
+@@ -21,7 +21,7 @@
+ #include <algorithm>
+ #include "gtest/gtest.h"
+ #include "gmock/gmock.h"
+-#include "geopm/json11.hpp"
++#include "json11.hpp"
+
+ #include "geopm_sched.h"
+ #include "geopm_hash.h"
diff --git a/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
new file mode 100644
index 000000000..ac0b75d9c
--- /dev/null
+++ b/sys-power/geopmd/geopmd-2.0.0_rc1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPV="${PV/_rc/+rc}"
+MYP="geopm-${MYPV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Global Extensible Open Power Manager (Daemon)"
+HOMEPAGE="https://github.com/geopm/geopm"
+SRC_URI="https://github.com/geopm/geopm/archive/refs/tags/v${MYPV}.tar.gz -> ${MYP}.gh.tar.gz"
+S="${WORKDIR}/geopm-${PV/_rc/-rc}/service"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug doc systemd"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ >=dev-python/cffi-1.15.0[${PYTHON_USEDEP}]
+ >=dev-python/dasbus-1.6[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]
+ ')
+ dev-cpp/json11
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-cpp/gtest
+"
+BDEPEND="doc? ( dev-python/sphinx )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-system-gtest.patch"
+ "${FILESDIR}/${P}-system-json11.patch"
+ "${FILESDIR}/${P}-no-Werror.patch"
+)
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ rm -r contrib || die
+ rm test/googletest.mk || die
+ rm src/geopm/json11.hpp || die
+ default
+ echo "${PV}" > VERSION || die
+ for ff in AUTHORS CODE_OF_CONDUCT.md CONTRIBUTING.rst COPYING COPYING-TPP; do
+ if [[ ! -f ${ff} ]]; then
+ cp ../${ff} . || die
+ fi
+ done
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-cnl-iogroup
+ --disable-coverage
+ --disable-dcgm
+ --disable-levelzero
+ --disable-nvml
+ $(use_enable debug)
+ $(use_enable doc docs)
+ $(use_enable systemd)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dodoc README.rst
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-power/geopmd/metadata.xml b/sys-power/geopmd/metadata.xml
new file mode 100644
index 000000000..3ae4f54cb
--- /dev/null
+++ b/sys-power/geopmd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>lssndrbarbieri@gmail.com</email>
+ <name>Alessandro Barbieri</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/geopm/geopm/issues</bugs-to>
+ <remote-id type="github">geopm/geopm</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-15 12:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-15 12:42 [gentoo-commits] repo/proj/guru:master commit in: sys-power/geopmd/files/, sys-power/geopmd/ Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox