File nutscanner-ftbfs.patch of Package nut

Overview Repositories Revisions Requests Users Attributes Meta

File nutscanner-ftbfs.patch of Package nut (Revision 83c98bb4d46afcd97587bc6c6889d7f2)

Currently displaying revision 83c98bb4d46afcd97587bc6c6889d7f2 , Show latest

commit 5d98d5536699222bc93c58c1e6f6df43dc9bfcff
Author: Arnaud Quette <arnaud.quette@free.fr>
Date:   Thu Mar 10 14:41:40 2016 +0100

Fix nut-scanner compilation in some environments
    
    Following the commits 5187dab (common: add some string-related functions) and
    e767df5 (common: consolidate some string-related functions), the build rules of
    nut-scanner were not updated to also use str.c. Since the libcommon.la
    dependency was still there, some environments managed to build cleanly, while
    other are failing.  Update build dependencies to fix this situation

diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
index 558cb23b..db85c682 100644
--- a/tools/nut-scanner/Makefile.am
+++ b/tools/nut-scanner/Makefile.am
@@ -14,14 +14,14 @@ libnutscan_la_SOURCES = scan_nut.c scan_ipmi.c \
 			scan_avahi.c scan_eaton_serial.c nutscan-serial.c \
 			../../drivers/serial.c \
 			../../drivers/bcmxcp_ser.c \
-			../../common/common.c
+			../../common/common.c ../../common/str.c
 libnutscan_la_LIBADD = $(NETLIBS) $(LIBLTDL_LIBS)
 libnutscan_la_LDFLAGS = $(SERLIBS) -version-info 1:0:0
 libnutscan_la_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include $(LIBLTDL_CFLAGS) -I$(top_srcdir)/drivers
 
 nut_scanner_SOURCES = nut-scanner.c
 nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
-nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la
+nut_scanner_LDADD = libnutscan.la
 
 if WITH_SSL
   libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)

Places

File nutscanner-ftbfs.patch of Package nut (Revision 83c98bb4d46afcd97587bc6c6889d7f2)

Places