Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nut: fix CGI setup

Browse source 
This commit makes

 - the libgd dependency (as well as specifying libs and includes)
 - the configure argument "--with-cgi"

dependant on whether the package nut-web-cgi is selected.

nut-web-cgi is also added to PKG_CONFIG_DEPENDS.

Resolves: #10641

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry-picked from cdd660a41d)
This commit is contained in:
Sebastian Kemper 2019-11-27 19:41:40 +01:00 committed by Rosen Penev
parent 7b07ac9e3d
commit 154da8aa02
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/nut/Makefile
View file

@ -26,7 +26,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_NUT_DRIVER_SNMP \
CONFIG_NUT_DRIVER_USB \
CONFIG_NUT_DRIVER_SERIAL \
CONFIG_NUT_SSL
CONFIG_NUT_SSL \
CONFIG_PACKAGE_nut-web-cgi
include $(INCLUDE_DIR)/package.mk
@ -302,7 +303,7 @@ endef
define Package/nut-web-cgi
$(call Package/nut/Default)
TITLE+= Web CGI interface
DEPENDS:=nut +nut-common +libgd
DEPENDS:=nut +nut-common +PACKAGE_nut-web-cgi:libgd
endef
define Package/nut-web-cgi/description
@ -531,7 +532,7 @@ CONFIGURE_ARGS += \
--without-powerman \
--without-wrap \
--with-hotplug-dir=/etc/hotplug \
--with-cgi \
--with$(if $(CONFIG_PACKAGE_nut-web-cgi),,out)-cgi \
--without-ipmi \
--without-freeipmi \
--$(if $(CONFIG_NUT_SSL),with,without)-ssl $(if $(CONFIG_NUT_SSL),--with-openssl) \
@ -539,7 +540,9 @@ CONFIGURE_ARGS += \
--with-statepath=/var/run/nut \
--with-drvpath=/lib/nut \
--with-user=root \
--with-group=root
--with-group=root \
$(if $(CONFIG_PACKAGE_nut-web-cgi),--with-gd-includes="`pkg-config --cflags gdlib`") \
$(if $(CONFIG_PACKAGE_nut-web-cgi),--with-gd-libs="`pkg-config --libs gdlib`")
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig