Arnaud Quette wrote:
> I've seen another mail from a SuSE guy, and fwded by Arjen, about
> libtool and possibly dependencies. I gotta check it.
Probably Andreas Schwab. His patch (see the attachment) applies on
2.2.2, but breaks the build. Without his patch, it fails on IA64 and
S390. I will look deeper into it:
gcc -DHAVE_CONFIG_H -I. -I../include -I../include -O2 -fmessage-length=0 -Wall
-D_FORTIFY_SOURCE=2 -fstack-protector -Wall -Wsign-compare -MT parseconf.lo -MD
-MP -MF .deps/parseconf.Tpo -c parseconf.c -fPIC -DPIC -o .libs/parseconf.o
mv -f .deps/state.Tpo .deps/state.Po
mv -f .deps/parseconf.Tpo .deps/parseconf.Po
mv -f .deps/common.Tpo .deps/common.Po
rm -f libcommon.a
/usr/bin/ar cru libcommon.a common.o
ranlib libcommon.a
mv -f .deps/parseconf.Tpo .deps/parseconf.Plo
mv: cannot stat `.deps/parseconf.Tpo': No such file or directory
make[1]: *** [parseconf.lo] Error 1
make[1]: Leaving directory `/usr/src/packages/BUILD/nut-2.2.2-pre3/common'
make: *** [all-recursive] Error 1
I am attaching one another cosmetic patch. It prevents warning mentioned
in the patch preamble, which is considered as error by SuSE QA tools.
Adding an explicit cast lets to know to the compiler, that cast from
integer for void * is really intended here.
Arnaud Quette wrote:
> I've tested it with "make -j2", and 2 config set (--disable-shared for
> full static, and --enable-static for linking clients on the shared lib
> while still shipping the static lib) and everything seems fine.
> Can you confirm on your side?
Yes, it seems to fix parallel build. Tried ~10 times, no failure.
Regarding my hald-addon path patch - it is an intermediate solution,
which will probably break in SuSE:
https://bugzilla.novell.com/show_bug.cgi?id=304316
But I guess that upstream will take care of correct setting of
hald-addon directory (see bugs in my previous mail).
--
Best Regards / S pozdravem,
Stanislav Brabec
software developer
---------------------------------------------------------------------
SUSE LINUX, s. r. o. e-mail: [EMAIL PROTECTED]
Lihovarská 1060/12 tel: +420 284 028 966, +49 911 740538747
190 00 Praha 9 fax: +420 284 028 951
Czech Republic http://www.suse.cz/
--- clients/Makefile.am
+++ clients/Makefile.am
@@ -42,10 +42,7 @@ libupsclient_la_LDFLAGS = -version-info
../common/libcommon.a: FORCE
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) libcommon.a)
-../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
-
-../common/parseconf.lo:
+../common/parseconf.lo ../common/parseconf.o:
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
FORCE:
--- common/Makefile.am
+++ common/Makefile.am
@@ -6,7 +6,7 @@ noinst_LIBRARIES = libcommon.a
libcommon_a_SOURCES = common.c ../include/nut_version.h
libcommon_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-all: libcommon.a upsconf.o parseconf.o state.o parseconf.lo
+all: upsconf.o state.o parseconf.lo
# Define a dummy library so that Automake builds rules for the
# corresponding object files. This library is not actually built,
--- drivers/Makefile.am
+++ drivers/Makefile.am
@@ -201,7 +201,7 @@ MOSTLYCLEANFILES = libnuthalmain.a
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
+ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
../common/state.o:
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
--- server/Makefile.am
+++ server/Makefile.am
@@ -23,7 +23,7 @@ sockdebug_SOURCES = sockdebug.c
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) upsconf.o)
../common/parseconf.o:
- (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.o)
+ (cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) parseconf.lo)
../common/state.o:
(cd ../common/ && $(MAKE) $(AM_MAKEFLAGS) state.o)
main-hal.c: In function 'dbus_filter_function':
main-hal.c:553: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast
main-hal.c:559: warning: passing argument 4 of 'dbus_send_reply' makes pointer from integer without a cast
================================================================================
--- drivers/main-hal.c
+++ drivers/main-hal.c
@@ -550,13 +550,13 @@
if (b_enable==TRUE) {
if (upsh.instcmd("beeper.enable", NULL) != STAT_INSTCMD_HANDLED) {
- dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1);
+ dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1));
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
}
else {
if (upsh.instcmd("beeper.disable", NULL) != STAT_INSTCMD_HANDLED) {
- dbus_send_reply(connection, message, DBUS_TYPE_INT32, -1);
+ dbus_send_reply(connection, message, DBUS_TYPE_INT32, (void *)(-1));
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
}
_______________________________________________
Nut-upsdev mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/nut-upsdev
