Changeset 3096

Timestamp:

09/18/05 22:39:53 (3 years ago)

Author:

mmh

Message:

(mmh)
This patch makes optional the sysfs support in libsensors. The default is to
*disable* sysfs support if a 2.4.x kernel is detected, for all other versions,
support will be enabled. This can be overridden in the top-level Makefile.

Files:

• lm-sensors/trunk/Makefile (modified) (2 diffs)
• lm-sensors/trunk/lib/Module.mk (modified) (2 diffs)
• lm-sensors/trunk/lib/sysfs.h (modified) (2 diffs)

lm-sensors/trunk/Makefile

@@ -87 +87 @@
-MODPREF := /lib/modules/$(shell $(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"')
-
+# When building userspace for use with 2.4.x series kernels, we turn off
+# sysfs support by default.  You can override this (e.g. if you want
+# to build binaries that work for both 2.4.x, and 2.6.x and above)
+# by uncommenting the line after the next endif.  Keep in mind, if and only
+# if you do this: you will need to install the libsysfs libraries on your
+# kernel 2.4.x systems also.
+ifeq (,$(findstring /2.4., $(MODPREF)))
+        SYSFS_SUPPORT := 1
+else
+        SYSFS_SUPPORT :=
+endif
+#SYSFS_SUPPORT := 1
+
-# Prevent 2.6+ users from using improper targets, as this won't work.
-ifeq (,$(findstring /2.4., $(MODPREF)))
@@ -258 +271 @@
-PROGCFLAGS := $(ALL_CFLAGS)
-ARCPPFLAGS := $(ALL_CPPFLAGS)
+ifdef SYSFS_SUPPORT
+ARCPPFLAGS := $(ARCPPFLAGS) -DSYSFS_SUPPORT
+endif
-ARCFLAGS := $(ALL_CFLAGS)
-LIBCPPFLAGS := $(ALL_CPPFLAGS)
+ifdef SYSFS_SUPPORT
+LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT
+endif
-LIBCFLAGS := -fpic $(ALL_CFLAGS)
-

lm-sensors/trunk/lib/Module.mk

@@ -50 +50 @@
-               $(MODULE_DIR)/error.c $(MODULE_DIR)/chips.c \
-               $(MODULE_DIR)/proc.c $(MODULE_DIR)/access.c \
-
+
+
+
+
+
-LIBOTHEROBJECTS := $(MODULE_DIR)/conf-parse.o $(MODULE_DIR)/conf-lex.o
-LIBSHOBJECTS := $(LIBCSOURCES:.c=.lo) $(LIBOTHEROBJECTS:.o=.lo)
@@ -61 +65 @@
-
-# How to create the shared library
+ifdef SYSFS_SUPPORT
-$(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
-        $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm -lsysfs
+else
+$(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
+        $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm
+endif
-
-$(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME)

lm-sensors/trunk/lib/sysfs.h

@@ -21 +21 @@
-#define SENSORS_LIB_SYSFS_H
-
+#ifdef SYSFS_SUPPORT
-extern int sensors_found_sysfs;
-
@@ -31 +32 @@
-extern int sensors_read_sysfs_bus(void);
-
+#else
+
+#define sensors_found_sysfs 0
+#define sensors_init_sysfs()
+#define sensors_read_sysfs_chips() (-1)
+#define sensors_read_sysfs_bus() (-1)
+
+#endif
+
-#endif /* !SENSORS_LIB_SYSFS_H */