[Nut-upsdev] [nut-commits] svn commit r915 - in trunk: . drivers

[Arjen de Korte]

Charles Lepple wrote:

> On 5/23/07, Kjell Claesson <keyson-guest at alioth.debian.org> wrote:
>> Author: keyson-guest
>> Date: Wed May 23 21:12:51 2007
>> New Revision: 915
>>
>> Log:
>>  - Enabled requested Alarm function in bcmxcp.c
>>
>> Modified:
>>    trunk/ChangeLog
>>    trunk/drivers/bcmxcp.c
> 
> Looks like this breaks when HAL is enabled.
> 
> At the end of: http://buildbot.ghz.cc/public/nut/Debian-etch-mipsel/builds/27/step-compile/0
> 
> gcc -I../../include -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal
> -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
> -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DINET6 -O2
> -D_REENTRANT -DNETSNMP_USE_INLINE -Wall -Dlinux -I. -I/usr/include -O
> -Wall -Wsign-compare -o hald-addon-bcmxcp_usb bcmxcp_usb.o bcmxcp.o
> nut_usb.o  ../common/libcommon.a libnuthalmain.a -L/usr/lib
> /usr/lib/libusb.so /usr/lib/libhal.so -ldbus-glib-1
> /usr/lib/libgobject-2.0.so /usr/lib/libglib-2.0.so -ldbus-1 -lrt
> bcmxcp.o: In function `upsdrv_updateinfo':
> bcmxcp.c:(.text+0x2c78): undefined reference to `alarm_init'
> bcmxcp.c:(.text+0x2cec): undefined reference to `alarm_set'
> bcmxcp.c:(.text+0x2f78): undefined reference to `alarm_commit'
> collect2: ld returned 1 exit status
> make[3]: *** [hald-addon-bcmxcp_usb] Error 1

I already took care of that in r916 by adding empty functions. This will
probably render the HAL version of this driver useless, but at least it
won't break compilation of the others. Since I have no idea how this HAL
stuff works, I'm not sure whether we can just copy these functions from
drivers/dstate.c or not. Volunteers?

Best regards, Arjen