| From 6d85773537c9f277ed342f57500f784ccb2c4a3e Mon Sep 17 00:00:00 2001 |
| From: Brendan Heading <brendanheading@gmail.com> |
| Date: Sun, 30 Aug 2015 22:26:39 +0100 |
| Subject: [PATCH 1/1] fix compilation under musl |
| |
| This patch removes conditional compilation elements that are designed to |
| support glibc versions earlier than 2.0, which were causing the build |
| to fail under musl. |
| |
| Based on the patch found here : |
| |
| http://git.alpinelinux.org/cgit/aports/plain/main/lm_sensors/musl-fix-includes.patch?id=fece1d19448dbd3a56fd8ac70443116187141848 |
| |
| This patch has been accepted for integration upstream and should be |
| present in the next release. See : |
| |
| http://www.lm-sensors.org/changeset/6314 |
| |
| Signed-off-by: Brendan Heading <brendanheading@gmail.com> |
| Upstream-Status: pending |
| --- |
| prog/dump/isadump.c | 6 ------ |
| prog/dump/isaset.c | 6 ------ |
| prog/dump/superio.c | 5 ----- |
| prog/dump/util.c | 5 ----- |
| 4 files changed, 22 deletions(-) |
| |
| diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c |
| index e031e47..88e4c3b 100644 |
| --- a/prog/dump/isadump.c |
| +++ b/prog/dump/isadump.c |
| @@ -36,13 +36,7 @@ |
| #include "util.h" |
| #include "superio.h" |
| |
| - |
| -/* To keep glibc2 happy */ |
| -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 |
| #include <sys/io.h> |
| -#else |
| -#include <asm/io.h> |
| -#endif |
| |
| #ifdef __powerpc__ |
| unsigned long isa_io_base = 0; /* XXX for now */ |
| diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c |
| index 1d1bdad..a084c8a 100644 |
| --- a/prog/dump/isaset.c |
| +++ b/prog/dump/isaset.c |
| @@ -32,13 +32,7 @@ |
| #include <string.h> |
| #include "util.h" |
| |
| - |
| -/* To keep glibc2 happy */ |
| -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 |
| #include <sys/io.h> |
| -#else |
| -#include <asm/io.h> |
| -#endif |
| |
| #ifdef __powerpc__ |
| unsigned long isa_io_base = 0; /* XXX for now */ |
| diff --git a/prog/dump/superio.c b/prog/dump/superio.c |
| index 1af7358..31e0d78 100644 |
| --- a/prog/dump/superio.c |
| +++ b/prog/dump/superio.c |
| @@ -20,12 +20,7 @@ |
| */ |
| |
| #include <stdlib.h> |
| - |
| -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 |
| #include <sys/io.h> |
| -#else |
| -#include <asm/io.h> |
| -#endif |
| |
| #include "superio.h" |
| |
| diff --git a/prog/dump/util.c b/prog/dump/util.c |
| index 676c339..d8b0927 100644 |
| --- a/prog/dump/util.c |
| +++ b/prog/dump/util.c |
| @@ -11,12 +11,7 @@ |
| #include <stdio.h> |
| #include "util.h" |
| |
| -/* To keep glibc2 happy */ |
| -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 |
| #include <sys/io.h> |
| -#else |
| -#include <asm/io.h> |
| -#endif |
| |
| /* Return 1 if we should continue, 0 if we should abort */ |
| int user_ack(int def) |
| -- |
| 2.4.3 |
| |