lm_sensors: add musl patch from alpine.

Doesn't fix build yet due to use of unconventional
object file extensions (which shouldn't matter but do).
This commit is contained in:
Will Dietz 2017-05-28 07:48:17 -05:00
parent 5d3af42250
commit e2ef21d9b5
2 changed files with 64 additions and 0 deletions

View file

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ bison flex which perl ]
++ stdenv.lib.optional sensord rrdtool;
patches = [ ./musl-fix-includes.patch ];
preBuild = ''
makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})

View file

@ -0,0 +1,62 @@
--- lm_sensors-3.3.4.orig/prog/dump/isadump.c
+++ lm_sensors-3.3.4/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 */
--- lm_sensors-3.3.4.orig/prog/dump/isaset.c
+++ lm_sensors-3.3.4/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 */
--- lm_sensors-3.3.4.orig/prog/dump/superio.c
+++ lm_sensors-3.3.4/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"
--- lm_sensors-3.3.4.orig/prog/dump/util.c
+++ lm_sensors-3.3.4/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)