- updated to 3.3.4

[packages/lm_sensors.git] / lm_sensors-iconv-in-libc.patch

diff --git a/lm_sensors-iconv-in-libc.patch b/lm_sensors-iconv-in-libc.patch
index e232cc95106f3898becdcf1c6755cbaead29a2e6..a2b3556bfe686fa0eed6664ec8d501d32f176eb6 100644 (file)
--- a/lm_sensors-iconv-in-libc.patch
+++ b/lm_sensors-iconv-in-libc.patch
@@ -1,22 +1,11 @@
---- lm_sensors-2.8.6/prog/sensors/Module.mk.orig       2004-03-27 11:30:04.000000000 +0100
-+++ lm_sensors-2.8.6/prog/sensors/Module.mk    2004-04-18 17:29:14.681584112 +0200
-@@ -33,7 +33,7 @@
- # executables.
- INCLUDEFILES += $(PROGSENSORSSOURCES:.c=.rd)
+--- lm_sensors-3.3.3/prog/sensors/Module.mk.orig       2012-11-10 12:13:01.190827366 +0100
++++ lm_sensors-3.3.3/prog/sensors/Module.mk    2012-11-10 13:45:03.160595632 +0100
+@@ -37,7 +37,7 @@
+ REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS))
+ REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES))
  
--LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi)
-+LIBICONV :=
+-LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi)
++LIBICONV := 
  
  $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
        $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors
---- lm_sensors-2.10.5/lib/test/Module.mk.orig  2007-10-25 04:31:25.000000000 +0200
-+++ lm_sensors-2.10.5/lib/test/Module.mk       2007-11-09 10:28:24.000000000 +0100
-@@ -4,7 +4,7 @@
- LIB_TEST_TARGETS := $(LIB_TEST_DIR)/test-scanner
- LIB_TEST_SOURCES := $(LIB_TEST_DIR)/test-scanner.c
- 
--LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi)
-+LIBICONV :=
- 
- LIB_TEST_SCANNER_OBJS := \
-       $(LIB_TEST_DIR)/test-scanner.ro \