From patchwork Fri Apr 1 20:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64904 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp32290lbc; Fri, 1 Apr 2016 13:39:07 -0700 (PDT) X-Received: by 10.140.20.39 with SMTP id 36mr26964312qgi.15.1459543147346; Fri, 01 Apr 2016 13:39:07 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w81si2791656qhw.107.2016.04.01.13.39.06; Fri, 01 Apr 2016 13:39:07 -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=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CCAEC61CD8; Fri, 1 Apr 2016 20:39:06 +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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED 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 2765261C68; Fri, 1 Apr 2016 20:39:02 +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 6E4AF61CB5; Fri, 1 Apr 2016 20:38:59 +0000 (UTC) Received: from mail-lf0-f48.google.com (mail-lf0-f48.google.com [209.85.215.48]) by lists.linaro.org (Postfix) with ESMTPS id 4CEED61BFD for ; Fri, 1 Apr 2016 20:38:57 +0000 (UTC) Received: by mail-lf0-f48.google.com with SMTP id k79so89417766lfb.2 for ; Fri, 01 Apr 2016 13:38:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MyaCU3HzjeEGugOaq5vRjLauc3K/9WKdH4txAEmTQHM=; b=hCDhB4sNP3/z3xajLLlgd7OJ4KpzvfYZ7hxads3zYcA37Ngxupt7+KXGOZnrF1MZcZ HqVPSNsmZ2CTKTat2urOUAc3yW4Hq3O9Ek/0kP1cFSyg7SZUc8cp8HrdaHjb0PsBGxF7 u0MGgeDPcMR+jbINpsVu5HKp0plGNDmsIUZCfv8BTvBeR0PUf8E2wTiu/f53mpzU0UBd ki4bji9zQoHvaSRYUrdq2duEjFcg5TLmKzpJDtT16nM6y/om3fjrhftRuPPjjBHam0N4 DaC+07UVD7YoEcfQglqzn8oUotIvmYMzAY3uPxIN2PebtXDsu9EW3S6RpI2xGvvKWahu A8ig== X-Gm-Message-State: AD7BkJK8bSDlAEa/roqn1f2KC8MgrimqJ4wMsmFIcoqbHnmnHS4yNaXEuRz0BT8rz7Mh6hfNhy8= X-Received: by 10.25.131.147 with SMTP id f141mr3248627lfd.12.1459543135487; Fri, 01 Apr 2016 13:38:55 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id h188sm2491443lfd.14.2016.04.01.13.38.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Apr 2016 13:38:54 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Fri, 1 Apr 2016 22:31:40 +0200 Message-Id: <1459542700-25447-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1459507135-19126-1-git-send-email-anders.roxell@linaro.org> References: <1459507135-19126-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2] configure: remove separate so_version file 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Set versioning in configure.ac directly, folks familiar with autotools will expect it to be set there. Suggested-by: Fathi Boudra Signed-off-by: Anders Roxell Reviewed-by: Ricardo Salveti --- .so_version | 1 - Makefile.am | 2 +- configure.ac | 10 +++++++--- scripts/builddeb | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 .so_version diff --git a/.so_version b/.so_version deleted file mode 100644 index dfa6588..0000000 --- a/.so_version +++ /dev/null @@ -1 +0,0 @@ -108:0:0 diff --git a/Makefile.am b/Makefile.am index a90eb91..2129472 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,4 +17,4 @@ SUBDIRS = @platform_with_platform@ \ @DX_RULES@ -EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion .so_version +EXTRA_DIST = bootstrap $(DX_CONFIG) CHANGELOG config/README .scmversion diff --git a/configure.ac b/configure.ac index 4d86817..5d274c7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,12 @@ AC_SYS_LARGEFILE AC_CONFIG_MACRO_DIR([m4]) AM_SILENT_RULES([yes]) +########################################################################## +# Set correct platform library version +########################################################################## +ODP_LIBSO_VERSION=108:0:0 +AC_SUBST(ODP_LIBSO_VERSION) + # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O @@ -61,10 +67,8 @@ AS_CASE([$host], AC_SUBST([ARCH]) ########################################################################## -# Set correct platform library version +# Set correct pkgconfig version ########################################################################## -ODP_LIBSO_VERSION=$(cat ${srcdir}/.so_version) -AC_SUBST(ODP_LIBSO_VERSION) PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') AC_SUBST(PKGCONFIG_VERSION) diff --git a/scripts/builddeb b/scripts/builddeb index b832df6..f28ee02 100755 --- a/scripts/builddeb +++ b/scripts/builddeb @@ -20,7 +20,8 @@ fi pushd ${ROOT_DIR}/${package}-${version} cp -r ${ROOT_DIR}/pkg/debian . -current=$(cat .so_version |awk -F : '{print $1}') +current=$(grep "^ODP_LIBSO_VERSION" ${ROOT_DIR}/configure.ac| \ + awk -F'=' '{print $2}' |awk -F : '{print $1}') rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control