From 8936b8d10e3758ed4142e6b0a1834cf7a560293f Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 7 Nov 2018 13:20:40 -0500 Subject: sys-power/thermald: fixes bug #670624 apologies if the bump isn't correct, but I wasn't sure if this might cause a runtime issue on other arches which successfully built and the package takes 20 seconds to build Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Rick Farina --- .../thermald/files/thermald-1.8-x86-fix.patch | 31 ++++++++++++++ sys-power/thermald/thermald-1.8-r1.ebuild | 47 ++++++++++++++++++++++ sys-power/thermald/thermald-1.8.ebuild | 46 --------------------- 3 files changed, 78 insertions(+), 46 deletions(-) create mode 100644 sys-power/thermald/files/thermald-1.8-x86-fix.patch create mode 100644 sys-power/thermald/thermald-1.8-r1.ebuild delete mode 100644 sys-power/thermald/thermald-1.8.ebuild (limited to 'sys-power') diff --git a/sys-power/thermald/files/thermald-1.8-x86-fix.patch b/sys-power/thermald/files/thermald-1.8-x86-fix.patch new file mode 100644 index 000000000000..e944003b79b7 --- /dev/null +++ b/sys-power/thermald/files/thermald-1.8-x86-fix.patch @@ -0,0 +1,31 @@ +From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Wed, 26 Sep 2018 10:34:15 +0800 +Subject: [PATCH] Use correct format specifier for size_t + +%zu instead of %lu, otherwise on 32 bit: + +| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()': +| ../git/src/thd_zone.cpp:106:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector::size_type' {aka 'unsigned int'} [-Werror=format=] +| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n", +| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| trip_points.size()); + +Signed-off-by: Anuj Mittal +--- + src/thd_zone.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp +index b7edf9e..cb7b8e8 100644 +--- a/src/thd_zone.cpp ++++ b/src/thd_zone.cpp +@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() { + } + + void cthd_zone::sort_and_update_poll_trip() { +- thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n", ++ thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n", + trip_points.size()); + if (trip_points.size()) { + unsigned int polling_trip = 0; diff --git a/sys-power/thermald/thermald-1.8-r1.ebuild b/sys-power/thermald/thermald-1.8-r1.ebuild new file mode 100644 index 000000000000..e578d903b8eb --- /dev/null +++ b/sys-power/thermald/thermald-1.8-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic out-of-source systemd + +DESCRIPTION="Thermal daemon for Intel architectures" +HOMEPAGE="https://01.org/linux-thermal-daemon" +SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/dbus-glib:= + dev-libs/glib:= + dev-libs/libxml2:= + sys-apps/dbus:=" +DEPEND="${RDEPEND} + dev-util/glib-utils" + +S=${WORKDIR}/thermal_daemon-${PV} +DOCS=( thermal_daemon_usage.txt README.txt ) + +src_prepare() { + epatch "${FILESDIR}"/"${P}"-x86-fix.patch + default + eautoreconf +} + +my_src_configure() { + # bug 618948 + append-cxxflags -std=c++14 + + ECONF_SOURCE="${S}" econf \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" +} + +my_src_install_all() { + einstalldocs + + rm -rf "${ED%/}"/etc/init || die + doinitd "${FILESDIR}"/thermald +} diff --git a/sys-power/thermald/thermald-1.8.ebuild b/sys-power/thermald/thermald-1.8.ebuild deleted file mode 100644 index 525bb27d6f06..000000000000 --- a/sys-power/thermald/thermald-1.8.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic out-of-source systemd - -DESCRIPTION="Thermal daemon for Intel architectures" -HOMEPAGE="https://01.org/linux-thermal-daemon" -SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-libs/dbus-glib:= - dev-libs/glib:= - dev-libs/libxml2:= - sys-apps/dbus:=" -DEPEND="${RDEPEND} - dev-util/glib-utils" - -S=${WORKDIR}/thermal_daemon-${PV} -DOCS=( thermal_daemon_usage.txt README.txt ) - -src_prepare() { - default - eautoreconf -} - -my_src_configure() { - # bug 618948 - append-cxxflags -std=c++14 - - ECONF_SOURCE="${S}" econf \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -my_src_install_all() { - einstalldocs - - rm -rf "${ED%/}"/etc/init || die - doinitd "${FILESDIR}"/thermald -} -- cgit v1.2.3-65-gdbad