mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
e2ef21d9b5
Doesn't fix build yet due to use of unconventional object file extensions (which shouldn't matter but do).
62 lines
1.4 KiB
Diff
62 lines
1.4 KiB
Diff
--- 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)
|