[oe-commits] org.oe.dev lm_sensors: Handle iconv more correctly avoiding compile failures

[rpurdie commit]

lm_sensors: Handle iconv more correctly avoiding compile failures

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 268db3b55b2c274dc80131afb8e377538bbcf813
ViewMTN: http://monotone.openembedded.org/revision.psp?id=268db3b55b2c274dc80131afb8e377538bbcf813
Files:
1
packages/lm_sensors/files/iconv.patch
packages/lm_sensors/lmsensors-apps_2.10.1.bb
Diffs:

#
# mt diff -r323a61386c38870d2e0b5b050d014c6ff276be1a -r268db3b55b2c274dc80131afb8e377538bbcf813
#
# 
# 
# add_file "packages/lm_sensors/files/iconv.patch"
#  content [3c2cc55264f94cfbb57b6feac18ab990164fb443]
# 
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
#  from [29f3445e114221a0424c4db6855ce1266833f3f6]
#    to [77da97f05946e612c7e93275f599fd5891b3876c]
# 
============================================================
--- packages/lm_sensors/files/iconv.patch	3c2cc55264f94cfbb57b6feac18ab990164fb443
+++ packages/lm_sensors/files/iconv.patch	3c2cc55264f94cfbb57b6feac18ab990164fb443
@@ -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
============================================================
--- packages/lm_sensors/lmsensors-apps_2.10.1.bb	29f3445e114221a0424c4db6855ce1266833f3f6
+++ packages/lm_sensors/lmsensors-apps_2.10.1.bb	77da97f05946e612c7e93275f599fd5891b3876c
@@ -1,13 +1,15 @@ HOMEPAGE = "http://secure.netroedge.com/
 # lmsensors-apps .bb build file
 # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see /COPYING)
 
 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}"