From patchwork Fri Oct 25 18:22:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Carrier X-Patchwork-Id: 1184391 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=orolia.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=orolia.com header.i=@orolia.com header.b="EB/W37+K"; dkim-atps=neutral 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 470CCH3GMfz9s4Y for ; Sat, 26 Oct 2019 05:22:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C96A585F63; Fri, 25 Oct 2019 18:22:49 +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 GgMyaUL2c66j; Fri, 25 Oct 2019 18:22:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E57BE85F43; Fri, 25 Oct 2019 18:22:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C4C071BF35A for ; Fri, 25 Oct 2019 18:22:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C1ABE85F2F for ; Fri, 25 Oct 2019 18:22:47 +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 pkvz_p1i6AUY for ; Fri, 25 Oct 2019 18:22:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150059.outbound.protection.outlook.com [40.107.15.59]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 012E185F43 for ; Fri, 25 Oct 2019 18:22:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YIqhUqPeAOwITuvTVqwy3XoYDbTOi2+woNwl0bFesD+khdvdKggwpAYRY9PW0EVG5sYHE63v+z7bd+3NX/5Iag76XTwVx2vLGK19mjdFeEny9PhuGpviICtecou8DNiis3zVHv5x/hYfoJja0NGj2toCYsN3B4uN6fX7ON3K+0cu97CKyqArvD6HOv+LPeSDbTzJr1CiRH5cSp9O8WqXjOOfh5CBin1F51zy1L4nnxxtLqmFvUQ+jf8/bTBHyBh1BgyPXiJ8dp+Fc5PsOiMcXc9q8YHv5n/e7DQU8TImGuOUNg06S4KEomCXVGsYs8+EggWQimhPIm+8HigCvny3vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n1Fm7+2rwrhwCQZ6OK9Kg58eAFO2eVq3vJFYECgqGs8=; b=Ihu6dBYRepDgbBsxEiMBkPc0UYnAUvADqfK0UMVqtNnekxg7FPw2qwHRbrDufswS4vEqAS/sVyymmwkPuGyfR/1PaMHxEmG57BdBjIjK1WRwMY858TGHZBPqPszVR0a84+473tKODXjUS0bXtasxpEMJWrKX74yyCz3FCJN6nlPF/lFTOq8wtqhsHEiKPVGeawl/L0vIcHzMke8jO0yyWv1ttVd8adbEXoE9krCcOV3xU7vhulAl7+6hCi05pUSfpU83hJFwOJSqR3lEPPEWcnEufjg21bd9m/wqmAzc4aJwnEaMvS+/w+5ifn53gFa/y/C0JxmWT+0bS4mhxUTkfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=orolia.com; dmarc=pass action=none header.from=orolia.com; dkim=pass header.d=orolia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orolia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n1Fm7+2rwrhwCQZ6OK9Kg58eAFO2eVq3vJFYECgqGs8=; b=EB/W37+Kea8kYoeJSBqirJiL30H5hKKNBxygLXLmrq4THWkve4n+tPDe+xeKqpHwSgpOodNYBt5+0ui7bbNdESEi/bRSOwnXXsUCzaUMwz08Ck6rHoB5PQGKiU1EWJIuxLQyUDbqvXci9S9Eue3aftLzeEHPzTGf16fQjzm1Ij8= Received: from DB7PR06MB4345.eurprd06.prod.outlook.com (52.135.138.156) by DB7PR06MB5337.eurprd06.prod.outlook.com (20.178.45.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2387.22; Fri, 25 Oct 2019 18:22:43 +0000 Received: from DB7PR06MB4345.eurprd06.prod.outlook.com ([fe80::447c:1bdb:1af8:f2ca]) by DB7PR06MB4345.eurprd06.prod.outlook.com ([fe80::447c:1bdb:1af8:f2ca%7]) with mapi id 15.20.2387.025; Fri, 25 Oct 2019 18:22:43 +0000 From: Nicolas Carrier To: "buildroot@buildroot.org" Thread-Topic: [PATCH v4 1/2] package: use variables defined by autoconf.mk Thread-Index: AQHVi2Exrdzm9xqF80C+tkbsBGQeCw== Date: Fri, 25 Oct 2019 18:22:43 +0000 Message-ID: <20191025182217.13682-1-nicolas.carrier@orolia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0092.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::32) To DB7PR06MB4345.eurprd06.prod.outlook.com (2603:10a6:5:36::28) authentication-results: spf=none (sender IP is ) smtp.mailfrom=nicolas.carrier@orolia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [176.157.204.145] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c8d4c3a2-268e-429d-7307-08d7597853d7 x-ms-traffictypediagnostic: DB7PR06MB5337:|DB7PR06MB5337: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 02015246A9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(376002)(346002)(39850400004)(396003)(366004)(199004)(189003)(2501003)(305945005)(66066001)(7736002)(86362001)(102836004)(386003)(54906003)(99286004)(6506007)(52116002)(8676002)(186003)(316002)(66446008)(66476007)(26005)(81156014)(1730700003)(81166006)(8936002)(50226002)(25786009)(486006)(476003)(4326008)(71190400001)(5640700003)(478600001)(6486002)(6512007)(44832011)(2616005)(71200400001)(66556008)(36756003)(64756008)(66946007)(3846002)(6116002)(6436002)(2351001)(2906002)(256004)(5660300002)(1076003)(14454004)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR06MB5337; H:DB7PR06MB4345.eurprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: orolia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wZmwJa+3t6U8fJMcvOhcldphTLhM/Z39JMp9ghQ60Ze9wP6wxaYXh5DLjBT8H4bXPOBE/KCQPlrnU3/Ld4DGXHq614h1vDse5C9uElR1bJ7oacRmUa2LC/IRY99773q7/AWuPnvIkkvgj8gR7P5ffuDVQYgEJtXDfjSo9AJlX80JvlFnQXZyzcdIw7fBD8p8vJU9VkWo8amNmRu3csyDnw6DFfw+PhNDDAB4gTar6VEHGZmaeBVBqVywATZOUk5Iaf4wa5LwAJNuIQTk0ULiKtNsYf13Qz9CSNyf9Rev7AeERWjrmTk+IVUAC2oLcWYant+ZTRtfl+Z/hwEjOZmNBLTQ0BbRo2Eu3LGWQa7erRxPGd75GPKWLVftiyPfr5fFZ8uTIngdV2+XOsuL7RYjtWH0Sy2PrUrw5cPzW8dXi395MHUNaNKA7M4Lt8aihWQ3 MIME-Version: 1.0 X-OriginatorOrg: orolia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8d4c3a2-268e-429d-7307-08d7597853d7 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Oct 2019 18:22:43.5279 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a263030c-9c1b-421f-9471-1dec0b29c664 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1qluRm1peNIx/8gAImqdiX9jlA9m2tifMrYMIdpcjxUEFa7Zr2jSHFmZj+hyTh5g+2nDOhkXFo1c9cFj9W7YjqVfNHxad9EcfLUQw4w5s0Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR06MB5337 Subject: [Buildroot] [PATCH v4 1/2] package: use variables defined by autoconf.mk 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: , Cc: Carlos Santos , Nicolas Carrier , Olivier Schonken Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" autoconf.mk defines AUTOCONF and AUTOHEADER variables, use them in packages using autoconf. This is a refactoring which shouldn't impact the final behavior. Signed-off-by: Nicolas Carrier Reviewed-by: Romain Naour --- package/cups/cups.mk | 2 +- package/libxmlrpc/libxmlrpc.mk | 2 +- package/ncftp/ncftp.mk | 2 +- package/php-amqp/php-amqp.mk | 4 ++-- package/php-geoip/php-geoip.mk | 4 ++-- package/php-gnupg/php-gnupg.mk | 4 ++-- package/php-imagick/php-imagick.mk | 4 ++-- package/php-memcached/php-memcached.mk | 4 ++-- package/php-ssh2/php-ssh2.mk | 4 ++-- package/php-yaml/php-yaml.mk | 4 ++-- package/php-zmq/php-zmq.mk | 4 ++-- package/socat/socat.mk | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index bc2913b428..b30fd78b9f 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -13,7 +13,7 @@ CUPS_INSTALL_STAGING = YES # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. define CUPS_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/bin/autoconf -f + cd $(@D); $(AUTOCONF) -f endef CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk index 90791bd671..54db9f1f89 100644 --- a/package/libxmlrpc/libxmlrpc.mk +++ b/package/libxmlrpc/libxmlrpc.mk @@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1) # Using autoconf, not automake, so we cannot use AUTORECONF = YES. define LIBXMLRPC_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/bin/autoconf + cd $(@D); $(AUTOCONF) endef LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index c8c8942333..676a9c5895 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -21,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv # We need to pass -I because of the non-standard m4 directory name, and # none of the other autotools are used, so the below is the easiest. define NCFTP_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/) + (cd $(@D); $(AUTOCONF) -I$(@D)/autoconf_local/) endef NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF diff --git a/package/php-amqp/php-amqp.mk b/package/php-amqp/php-amqp.mk index c808ecdbd6..8f3ba1f9f4 100644 --- a/package/php-amqp/php-amqp.mk +++ b/package/php-amqp/php-amqp.mk @@ -16,8 +16,8 @@ PHP_AMQP_LICENSE_FILES = LICENSE define PHP_AMQP_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-geoip/php-geoip.mk b/package/php-geoip/php-geoip.mk index 82ecba5816..8bff564e2d 100644 --- a/package/php-geoip/php-geoip.mk +++ b/package/php-geoip/php-geoip.mk @@ -16,8 +16,8 @@ PHP_GEOIP_LICENSE_FILES = geoip.c define PHP_GEOIP_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk index ae0a781154..8137da4978 100644 --- a/package/php-gnupg/php-gnupg.mk +++ b/package/php-gnupg/php-gnupg.mk @@ -16,8 +16,8 @@ PHP_GNUPG_LICENSE_FILES = LICENSE define PHP_GNUPG_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk index ca0cbc7492..a5541b0035 100644 --- a/package/php-imagick/php-imagick.mk +++ b/package/php-imagick/php-imagick.mk @@ -16,8 +16,8 @@ PHP_IMAGICK_LICENSE_FILES = LICENSE define PHP_IMAGICK_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk index 4607d099f3..67ccc6747a 100644 --- a/package/php-memcached/php-memcached.mk +++ b/package/php-memcached/php-memcached.mk @@ -18,8 +18,8 @@ PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h define PHP_MEMCACHED_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk index c9c13010dd..98453acbcf 100644 --- a/package/php-ssh2/php-ssh2.mk +++ b/package/php-ssh2/php-ssh2.mk @@ -16,8 +16,8 @@ PHP_SSH2_LICENSE_FILES = LICENSE define PHP_SSH2_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index e23d897978..40f7385c6a 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE define PHP_YAML_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/php-zmq/php-zmq.mk b/package/php-zmq/php-zmq.mk index fed71955b6..892c42130f 100644 --- a/package/php-zmq/php-zmq.mk +++ b/package/php-zmq/php-zmq.mk @@ -15,8 +15,8 @@ PHP_ZMQ_LICENSE_FILES = LICENSE define PHP_ZMQ_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ + PHP_AUTOCONF=$(AUTOCONF) \ + PHP_AUTOHEADER=$(AUTOHEADER) \ $(STAGING_DIR)/usr/bin/phpize) endef diff --git a/package/socat/socat.mk b/package/socat/socat.mk index c6f99c2afa..41748d8227 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -41,7 +41,7 @@ SOCAT_CONF_OPTS += --disable-readline endif define SOCAT_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/bin/autoconf) + (cd $(@D); $(AUTOCONF)) endef SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF