summaryrefslogtreecommitdiff
path: root/sys-power/powertop/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-03-02 07:28:45 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-03-02 07:28:45 +0000
commit4c91fc4c0d1da2829c584bd0517280eb4daf33d5 (patch)
tree0ae0ff890238f90dcc97bff617271214c48d2f1f /sys-power/powertop/files
parent5711c6777e7610093a43849c3d874c52ac421b64 (diff)
gentoo auto-resync : 02:03:2023 - 07:28:45
Diffstat (limited to 'sys-power/powertop/files')
-rw-r--r--sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch60
-rw-r--r--sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch28
2 files changed, 0 insertions, 88 deletions
diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
deleted file mode 100644
index 7f2b7820ff2f..000000000000
--- a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:37:24 +0100
-Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac
- file"
-
-This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d.
----
- README.md | 4 ++--
- configure.ac | 9 +++++++++
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/README.md b/README.md
-index 1b17365..43bd5b2 100644
---- a/README.md
-+++ b/README.md
-@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*:
-
- sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \
- libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \
-- dh-autoreconf pkg-config
-+ dh-autoreconf autoconf-archive pkg-config
-
-
- ## Building PowerTOP
-@@ -39,7 +39,7 @@ source files are modified.
- To build PowerTOP from the cloned source, use the following commands:
-
- ./autogen.sh
-- ./configure LDFLAGS='-pthread'
-+ ./configure
- make
-
-
-diff --git a/configure.ac b/configure.ac
-index 2571c5d..7eeeb9c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL
- AC_PROG_CC
- AC_PROG_INSTALL
- AM_PROG_CC_C_O
-+AX_ADD_FORTIFY_SOURCE
-+AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
- PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
-+AX_PTHREAD([
-+ LIBS="$PTHREAD_LIBS $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+ CC="$PTHREAD_CC"
-+ ], [
-+ AC_MSG_ERROR([Could not configure pthreads support])
-+])
-
- # Checks for header files.
- AC_CHECK_HEADERS([ \
---
-2.32.0
-
diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
deleted file mode 100644
index f036bf73d619..000000000000
--- a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Thu, 15 Apr 2021 11:45:13 +0100
-Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED
-
-Require additional macros to be defined early, to avoid an aclocal
-"too many loops" error when copying macros.
----
- configure.ac | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 7eeeb9c..37c1304 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.18.2])
-
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
-+AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
-+AX_REQUIRE_DEFINED([AX_PTHREAD])
- # Checks for programs.
- AC_PROG_CPP
- AC_PROG_CXX
---
-2.32.0
-