summaryrefslogtreecommitdiff
path: root/packages/lm_sensors
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-04-14 22:22:27 +0000
committerRichard Purdie <rpurdie@rpsys.net>2007-04-14 22:22:27 +0000
commit53e60de7848e4b1e3e0e32374d4f9dc34ed6dbb8 (patch)
treec18a861737c192f9740957194b1d969fd892a8de /packages/lm_sensors
parent12d096303a3288d337eba3d273ed6bc263abae0f (diff)
lm_sensors: Handle iconv more correctly avoiding compile failures
Diffstat (limited to 'packages/lm_sensors')
-rw-r--r--packages/lm_sensors/files/iconv.patch13
-rw-r--r--packages/lm_sensors/lmsensors-apps_2.10.1.bb4
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/lm_sensors/files/iconv.patch b/packages/lm_sensors/files/iconv.patch
new file mode 100644
index 0000000000..4aecafafb1
--- /dev/null
+++ b/packages/lm_sensors/files/iconv.patch
@@ -0,0 +1,13 @@
+Index: lm_sensors-2.10.1/prog/sensors/Module.mk
+===================================================================
+--- lm_sensors-2.10.1.orig/prog/sensors/Module.mk 2006-09-24 22:30:10.000000000 +0000
++++ lm_sensors-2.10.1/prog/sensors/Module.mk 2007-04-14 22:11:47.000000000 +0000
+@@ -36,7 +36,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 := -liconv
+
+ $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
+ $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors
diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
index 8013f67f6a..bbe484f74e 100644
--- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb
+++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb
@@ -4,10 +4,12 @@
DESCRIPTION = "Hardware health monitoring applications"
HOMEPAGE = "http://secure.netroedge.com/~lm78/"
-DEPENDS = "libsysfs"
+DEPENDS = "libsysfs virtual/libiconv"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \
+ file://iconv.patch;patch=1 \
file://add-sysfs-ldflags.patch;patch=1"
S = "${WORKDIR}/lm_sensors-${PV}"