From patchwork Fri Jun 23 22:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 106288 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp420374qgd; Fri, 23 Jun 2017 15:01:41 -0700 (PDT) X-Received: by 10.200.37.1 with SMTP id 1mr11660168qtm.216.1498255300702; Fri, 23 Jun 2017 15:01:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498255300; cv=none; d=google.com; s=arc-20160816; b=0QkM9kEqiOEnQ+IGMFN04w5HJDgsyjKAG4OS5sZ1mly4eYJP0kXo+vsN28E37HU2P+ dZjGV9wceWLW5CiYsp3m1qVwlRoe8km4DTNdtXgoobUJKYaaucvO8Ok8Z6VR7zJLU3B9 OmZFp/dEgjTtUGbYoGl05bA8D3lx025EnbZHWPllRLfiyt+VPXYyrps2Ybt00wF/fz7V uefJ1P1eqQT8S0AgPYp/OCCFmb6KVnpeBI1vFmycbYzxvMUKI0emyY9ZXaj3Fa3Q+AvW M77wpwcQ8a0iREKRIdZYc9BswUqEKcmUm9k6zyOSUD2TyYGCOegPS82Jo932AlfTssOe GxJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=qmnCoz8iAt4VViHg4tt69kMxbhG3yoyOvQQw4UN1vxQ=; b=lT5VSlK6aRT/KlqywCqs9p7tw8GFoV6d0Mpok2krM4MUO67IfI6V0KpyfbRBrglVJX 7rgXoEKzf2L+tq+vXHhHccYjTeSHLJIaPkh/VVpSOGyr8Crt//3OBenPC7yUwgLkAjI3 vdyrVcq73uJfjYOmNNRoOL/0fytiKeoJvW5aZjQULIsYiTIuI3WUEURd3Qoh9uAjzeAS xauQxF+ouGxc3o4On90FFNfyws3c00tJrNIJHsCnA93mWyZ+dTUHb1jjGNcM7TOeaVeq SzIubd4qauj1mkZK5fovsTpbaySUeZXGhxhQw+keJDJ3uQPAXa5zWIO6x9PoTAAlGGWo bUzQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r12si5341634qkh.93.2017.06.23.15.01.40; Fri, 23 Jun 2017 15:01:40 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 29AE16069C; Fri, 23 Jun 2017 22:01:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, URIBL_BLOCKED, URIBL_SBL_A autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3985960791; Fri, 23 Jun 2017 22:01:09 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 24301609F6; Fri, 23 Jun 2017 22:01:02 +0000 (UTC) Received: from forward5o.cmail.yandex.net (forward5o.cmail.yandex.net [37.9.109.249]) by lists.linaro.org (Postfix) with ESMTPS id EB525607C6 for ; Fri, 23 Jun 2017 22:00:17 +0000 (UTC) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [37.140.190.27]) by forward5o.cmail.yandex.net (Yandex) with ESMTP id E6977212BC for ; Sat, 24 Jun 2017 01:00:15 +0300 (MSK) Received: from smtp2o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp2o.mail.yandex.net (Yandex) with ESMTP id C3E3B5080FDC for ; Sat, 24 Jun 2017 01:00:15 +0300 (MSK) Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OeT2KIGU1B-0EUWQuor; Sat, 24 Jun 2017 01:00:14 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) X-Yandex-Suid-Status: 1 0 From: Github ODP bot To: lng-odp@lists.linaro.org Date: Sat, 24 Jun 2017 01:00:12 +0300 Message-Id: <1498255212-4190-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1498255212-4190-1-git-send-email-odpbot@yandex.ru> References: <1498255212-4190-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 57 Subject: [lng-odp] [PATCH v1 1/1] configure: remove dependency of autoconf-archive X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov autoconf-archive is not available if you build with cross toolchains. Number of projects simple have local copy of this file. Signed-off-by: Maxim Uvarov --- /** Email created from pull request 57 (muvarov:master_no_autoconf_archive) ** https://github.com/Linaro/odp/pull/57 ** Patch: https://github.com/Linaro/odp/pull/57.patch ** Base sha: 497c339f94e35d5fadeff539cebfbf44d698dc7e ** Merge commit sha: 0632886e269894df5d0560bdad84a45f9a2b3c81 **/ .travis.yml | 2 +- DEPENDENCIES | 5 +- Makefile.am | 2 +- configure.ac | 1 + m4/autoconf-archive/ax_check_compile_flag.m4 | 72 ++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 m4/autoconf-archive/ax_check_compile_flag.m4 diff --git a/.travis.yml b/.travis.yml index 2cc8caf7..bae23600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ addons: packages: - gcc - clang-3.8 - - automake autoconf autoconf-archive libtool libssl-dev graphviz mscgen doxygen + - automake autoconf libtool libssl-dev graphviz mscgen doxygen - libpcap-dev # coverity_scan: # project: diff --git a/DEPENDENCIES b/DEPENDENCIES index 7bcbd5eb..a194cad1 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -8,14 +8,13 @@ Prerequisites for building the OpenDataPlane (ODP) API automake autoconf - autoconf-archive libtool On Debian/Ubuntu systems: - $ sudo apt-get install automake autoconf autoconf-archive libtool + $ sudo apt-get install automake autoconf libtool On CentOS/RedHat/Fedora systems: - $ sudo yum install automake autoconf autoconf-archive libtool + $ sudo yum install automake autoconf libtool 3. Required libraries diff --git a/Makefile.am b/Makefile.am index fff1276a..cfcef22a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS=-I m4 +ACLOCAL_AMFLAGS=-I m4 -I m4/autoconf-archive AUTOMAKE_OPTIONS = foreign AM_DISTCHECK_CONFIGURE_FLAGS = --enable-test-cpp \ --enable-test-example \ diff --git a/configure.ac b/configure.ac index 45812f66..148ca0e9 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AM_CONFIG_HEADER([helper/config.h]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_CONFIG_MACRO_DIR([m4]) +m4_include([m4/autoconf-archive/ax_check_compile_flag.m4]) AM_SILENT_RULES([yes]) ########################################################################## diff --git a/m4/autoconf-archive/ax_check_compile_flag.m4 b/m4/autoconf-archive/ax_check_compile_flag.m4 new file mode 100644 index 00000000..c3a8d695 --- /dev/null +++ b/m4/autoconf-archive/ax_check_compile_flag.m4 @@ -0,0 +1,72 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS