mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-28 13:00:42 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/dhcp: fix autoreconf for libtool-enabled build

Browse Source 
Upstream provides two configure.ac versions, the default one does not
use libtool. For libtool-enabled builds the default configure.ac calls
https://gitlab.isc.org/isc-projects/dhcp/blob/master/configure.ac#L873
https://gitlab.isc.org/isc-projects/dhcp/blob/master/config+lt

which copies configure.ac+lt to configure.ac and starts autoreconf.

On host systems lacking autoreconf this causes a build error:

configure: WARNING: legacy configure is used but libtool is enabled. Trying to recover...
/home/buildroot/autobuild/instance-2/output-1/build/dhcp-4.4.1/config+lt: 20:
 /home/buildroot/autobuild/instance-2/output-1/build/dhcp-4.4.1/config+lt: autoreconf: not found
autoreconf failed

Fixes:
http://autobuild.buildroot.net/results/16f/16f800dd844572336c2fbba3d123604405382a84/
http://autobuild.buildroot.net/results/eac/eac1e7b25128476eccf40aece612e13a1e0637dc/
http://autobuild.buildroot.net/results/8fc/8fcfe7b40af3ae42549351c70466b4dd388820e3/
http://autobuild.buildroot.net/results/7ff/7ff82708b9dea09f1447f0ef94b9bb21fca73196/
http://autobuild.buildroot.net/results/1c5/1c5f401ce7eef13f5ca4603ca8d7c67da249d7c9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 3817b79869)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls
2019-11-11 04:31:06 +01:00
committed by Peter Korsgaard
parent 8dd537aeca
commit 61c0a5867e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/dhcp/dhcp.mk
View File

@@ -10,6 +10,12 @@ DHCP_INSTALL_STAGING = YES
DHCP_LICENSE = MPL-2.0
DHCP_LICENSE_FILES = LICENSE
DHCP_DEPENDENCIES = bind
# use libtool-enabled configure.ac
define DHCP_LIBTOOL_AUTORECONF
cp $(@D)/configure.ac+lt $(@D)/configure.ac
endef
DHCP_CONF_ENV = \
CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
@@ -33,6 +39,8 @@ ifeq ($(BR2_STATIC_LIBS),y)
DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`"
DHCP_CONF_OPTS += --disable-libtool
else
DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF
DHCP_AUTORECONF = YES
DHCP_CONF_OPTS += --enable-libtool
endif