From patchwork Mon Nov 11 03:31:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1192718 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47BGcy5lSWz9sPV for ; Mon, 11 Nov 2019 14:31:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9CDDF85FA4; Mon, 11 Nov 2019 03:31:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uM0FpcXb60ZY; Mon, 11 Nov 2019 03:31:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 93EE085F92; Mon, 11 Nov 2019 03:31:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BCE0A1BF954 for ; Mon, 11 Nov 2019 03:31:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B51222107A for ; Mon, 11 Nov 2019 03:31:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZFX64B2g21gm for ; Mon, 11 Nov 2019 03:31:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by silver.osuosl.org (Postfix) with ESMTPS id BA940203EA for ; Mon, 11 Nov 2019 03:31:17 +0000 (UTC) Received: from fwd02.aul.t-online.de (fwd02.aul.t-online.de [172.20.26.148]) by mailout06.t-online.de (Postfix) with SMTP id 042FD41A3ADC for ; Mon, 11 Nov 2019 04:31:15 +0100 (CET) Received: from fli4l.lan.fli4l (GD4v6GZGrhpteWB79vtyj6FKaQlbcx9lWy2vNrsNuaXvhxaJUkk4vExKLT6Th+ZweE@[91.58.9.27]) by fwd02.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iU0Pz-430cue0; Mon, 11 Nov 2019 04:31:07 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:42770) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iU0Py-0001yr-8R for buildroot@buildroot.org; Mon, 11 Nov 2019 04:31:06 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Mon, 11 Nov 2019 04:31:06 +0100 Message-Id: <20191111033106.6987-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: GD4v6GZGrhpteWB79vtyj6FKaQlbcx9lWy2vNrsNuaXvhxaJUkk4vExKLT6Th+ZweE X-TOI-MSGID: 76d4c010-9bf2-4454-a73b-64341874e463 Subject: [Buildroot] [PATCH 1/1] package/dhcp: fix autoreconf for libtool-enabled build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/dhcp/dhcp.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 0abb0aebd7..5e0bcca71f 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -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