mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
powertop: fix aclocal error too many loops
Backport configure.ac patches to fix aclocal: error: too many loops Adds build dependency on autoconf-archive References: https://bugzilla.redhat.com/show_bug.cgi?id=1826935 (From OE-Core rev: 5a7e1e531d70eb41638c247b70791f2f3aea8793) Signed-off-by: Tim Orling <timothy.t.orling@intel.com> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tim Orling
committed by
Richard Purdie
Richard Purdie
parent
2c53b198ed
commit
d4b4bf172f
@@ -0,0 +1,70 @@
|
|||||||
|
From 0d833743954ac1c58773cbf7a78fe0dc8105ae4a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joe Konno <joe.konno@linux.intel.com>
|
||||||
|
Date: Tue, 11 Feb 2020 14:15:42 -0800
|
||||||
|
Subject: [PATCH] configure.ac: ax_add_fortify_source
|
||||||
|
|
||||||
|
Use a maintained autoconf-archive macro to determine whether we need to
|
||||||
|
add -D_FORTIFY_SOURCE=3D2, or if the underlying OS (or toolchain) has it
|
||||||
|
baked in.
|
||||||
|
|
||||||
|
Signed-off-by: Joe Konno <joe.konno@intel.com>
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
aclocal: error: too many loops
|
||||||
|
|
||||||
|
Upstream-Status: Backport from 2.12
|
||||||
|
Signed-off-by: Tim Orling <timothy.t.orling@intel.com>
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
m4/gcc_fortify_source_cc.m4 | 29 -----------------------------
|
||||||
|
2 files changed, 1 insertion(+), 30 deletions(-)
|
||||||
|
delete mode 100644 m4/gcc_fortify_source_cc.m4
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index d6a15e1..d68369c 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AM_PROG_CC_C_O
|
||||||
|
-GCC_FORTIFY_SOURCE_CC
|
||||||
|
+AX_ADD_FORTIFY_SOURCE
|
||||||
|
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
|
||||||
|
|
||||||
|
# Checks for libraries.
|
||||||
|
diff --git a/m4/gcc_fortify_source_cc.m4 b/m4/gcc_fortify_source_cc.m4
|
||||||
|
deleted file mode 100644
|
||||||
|
index 1206672..0000000
|
||||||
|
--- a/m4/gcc_fortify_source_cc.m4
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,29 +0,0 @@
|
||||||
|
-dnl GCC_FORTIFY_SOURCE_CC
|
||||||
|
-dnl checks -D_FORTIFY_SOURCE with the C++ compiler, if it exists then
|
||||||
|
-dnl updates CXXCPP
|
||||||
|
-AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[
|
||||||
|
- AC_LANG_ASSERT([C++])
|
||||||
|
- AS_IF([test "X$CXX" != "X"], [
|
||||||
|
- AC_MSG_CHECKING([for FORTIFY_SOURCE support])
|
||||||
|
- fs_old_cxxcpp="$CXXCPP"
|
||||||
|
- fs_old_cxxflags="$CXXFLAGS"
|
||||||
|
- CXXCPP="$CXXCPP -D_FORTIFY_SOURCE=2"
|
||||||
|
- CXXFLAGS="$CXXFLAGS -Werror"
|
||||||
|
- AC_COMPILE_IFELSE([
|
||||||
|
- AC_LANG_PROGRAM([[]], [[
|
||||||
|
- int main(void) {
|
||||||
|
- #if !(__GNUC_PREREQ (4, 1) )
|
||||||
|
- #error No FORTIFY_SOURCE support
|
||||||
|
- #endif
|
||||||
|
- return 0;
|
||||||
|
- }
|
||||||
|
- ]], [
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- ], [
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- CXXCPP="$fs_old_cxxcpp"
|
||||||
|
- ])
|
||||||
|
- ])
|
||||||
|
- CXXFLAGS="$fs_old_cxxflags"
|
||||||
|
- ])
|
||||||
|
-])
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
From fbf74492236676e844b021b0dbb45b1ca43a0410 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David King <amigadave@amigadave.com>
|
||||||
|
Date: Thu, 15 Apr 2021 11:45:13 +0100
|
||||||
|
Subject: [PATCH] configure: Use AX_REQUIRE_DEFINED
|
||||||
|
|
||||||
|
Require additional macros to be defined early, to avoid an aclocal
|
||||||
|
"too many loops" error when copying macros.
|
||||||
|
|
||||||
|
Upstream-Status: Backport from tip
|
||||||
|
|
||||||
|
Signed-off-by: Tim Orling <ticotimo@gmail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index d68369c..b90831b 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,13 +2,15 @@ SUMMARY = "Power usage tool"
|
|||||||
DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
|
DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
|
||||||
HOMEPAGE = "https://01.org/powertop/"
|
HOMEPAGE = "https://01.org/powertop/"
|
||||||
BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla"
|
BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla"
|
||||||
DEPENDS = "ncurses libnl pciutils"
|
DEPENDS = "ncurses libnl pciutils autoconf-archive"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
|
SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \
|
||||||
file://0001-wakeup_xxx.h-include-limits.h.patch \
|
file://0001-wakeup_xxx.h-include-limits.h.patch \
|
||||||
"
|
file://0002-configure.ac-ax_add_fortify_source.patch \
|
||||||
|
file://0003-configure-Use-AX_REQUIRE_DEFINED.patch \
|
||||||
|
"
|
||||||
SRCREV = "e8765b5475b22b7a2b6e9e8a031c68a268a0b0b3"
|
SRCREV = "e8765b5475b22b7a2b6e9e8a031c68a268a0b0b3"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user