Add libltdl-dev to the build-dependencies and fix FTBFS when it is installed (Closes: #831740)

This commit is contained in:
Laurent Bigonville 2019-02-04 16:28:24 +01:00
parent 08288b6a7f
commit e437c6972c
4 changed files with 42 additions and 2 deletions

9
debian/changelog vendored
View file

@ -6,9 +6,14 @@ nut (2.7.4-9) UNRELEASED; urgency=medium
[ Arnaud Quette ]
* debian/control, debian/rules, debian/libnutscan1.install,
debian/libnutscan-dev.install: distribute nut-scanner. (Closes: #921379)
debian/libnutscan-dev.install: distribute nut-scanner. (Closes: #921379
LP: #1814314)
-- Arnaud Quette <aquette@debian.org> Tue, 26 Feb 2019 13:34:07 +0100
[ Laurent Bigonville ]
* Add libltdl-dev to the build-dependencies and fix FTBFS when it is
installed (Closes: #831740)
-- Laurent Bigonville <bigon@debian.org> Mon, 04 Feb 2019 16:25:36 +0100
nut (2.7.4-8) unstable; urgency=medium

1
debian/control vendored
View file

@ -11,6 +11,7 @@ Build-Depends: autotools-dev,
libfreeipmi-dev (>= 0.8.5) [!hurd-i386],
libgd-dev | libgd2-xpm-dev | libgd2-noxpm-dev,
libipmimonitoring-dev (>= 1.1.5-2) [!hurd-i386],
libltdl-dev,
libneon27-gnutls-dev | libneon27-dev,
libnss3-dev,
libpowerman0-dev (>= 2.3.3),

View file

@ -0,0 +1,33 @@
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)

View file

@ -4,3 +4,4 @@
0006-ups-conf-maxretry.patch
0008-drop-w3c-icons.patch
0009-fix-nutshutdown-install.patch
0010-fix-nutscanner-ftbfs.patch