mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
libacpi: Fix build with -fno-common
(From OE-Core rev: 6d4bfd341eb48e6904cb5b645727cbf351f02a2e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -0,0 +1,68 @@
|
|||||||
|
From 9839c169f513e65fc711646257b3e8588cce623c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Wed, 5 Aug 2020 12:06:01 -0700
|
||||||
|
Subject: [PATCH] libacpi: Fix build witth -fno-commom
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
libacpi.c | 16 ++++++++++++++++
|
||||||
|
libacpi.h | 6 +++---
|
||||||
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libacpi.c b/libacpi.c
|
||||||
|
index 4e34725..9344ea4 100644
|
||||||
|
--- a/libacpi.c
|
||||||
|
+++ b/libacpi.c
|
||||||
|
@@ -14,6 +14,22 @@
|
||||||
|
#include "libacpi.h"
|
||||||
|
#include "list.h"
|
||||||
|
|
||||||
|
+/**
|
||||||
|
+ * Array for existing batteries, loop until
|
||||||
|
+ * globals->battery_count
|
||||||
|
+ */
|
||||||
|
+battery_t batteries[MAX_ITEMS];
|
||||||
|
+/**
|
||||||
|
+ * Array for existing thermal zones, loop until
|
||||||
|
+ * globals->thermal_count
|
||||||
|
+ */
|
||||||
|
+thermal_t thermals[MAX_ITEMS];
|
||||||
|
+/**
|
||||||
|
+ * Array for existing fans, loop until
|
||||||
|
+ * globals->fan_count
|
||||||
|
+ */
|
||||||
|
+fan_t fans[MAX_ITEMS];
|
||||||
|
+
|
||||||
|
static int read_acpi_battinfo(const int num);
|
||||||
|
static int read_acpi_battalarm(const int num);
|
||||||
|
static int read_acpi_battstate(const int num);
|
||||||
|
diff --git a/libacpi.h b/libacpi.h
|
||||||
|
index 9334b79..5242d3d 100644
|
||||||
|
--- a/libacpi.h
|
||||||
|
+++ b/libacpi.h
|
||||||
|
@@ -183,17 +183,17 @@ typedef struct {
|
||||||
|
* Array for existing batteries, loop until
|
||||||
|
* globals->battery_count
|
||||||
|
*/
|
||||||
|
-battery_t batteries[MAX_ITEMS];
|
||||||
|
+extern battery_t batteries[MAX_ITEMS];
|
||||||
|
/**
|
||||||
|
* Array for existing thermal zones, loop until
|
||||||
|
* globals->thermal_count
|
||||||
|
*/
|
||||||
|
-thermal_t thermals[MAX_ITEMS];
|
||||||
|
+extern thermal_t thermals[MAX_ITEMS];
|
||||||
|
/**
|
||||||
|
* Array for existing fans, loop until
|
||||||
|
* globals->fan_count
|
||||||
|
*/
|
||||||
|
-fan_t fans[MAX_ITEMS];
|
||||||
|
+extern fan_t fans[MAX_ITEMS];
|
||||||
|
/**
|
||||||
|
* Finds existing batteries and fills the
|
||||||
|
* corresponding batteries structures with the paths
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
@@ -11,7 +11,9 @@ SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
|
|||||||
file://makefile-fix.patch \
|
file://makefile-fix.patch \
|
||||||
file://libacpi_fix_for_x32.patch \
|
file://libacpi_fix_for_x32.patch \
|
||||||
file://use_correct_strip_in_cross_environment.patch \
|
file://use_correct_strip_in_cross_environment.patch \
|
||||||
file://ldflags.patch "
|
file://ldflags.patch \
|
||||||
|
file://0001-libacpi-Fix-build-witth-fno-commom.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
|
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
|
||||||
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
|
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
|
||||||
|
|||||||
Reference in New Issue
Block a user