From patchwork Tue Mar 29 06:38:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64568 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1837209lbc; Mon, 28 Mar 2016 23:45:56 -0700 (PDT) X-Received: by 10.140.174.86 with SMTP id u83mr643675qhu.35.1459233953666; Mon, 28 Mar 2016 23:45:53 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r8si12352561qha.83.2016.03.28.23.45.53; Mon, 28 Mar 2016 23:45:53 -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 Received: by lists.linaro.org (Postfix, from userid 109) id E47FC6170D; Tue, 29 Mar 2016 06:45:52 +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 100CB611FA; Tue, 29 Mar 2016 06:45:48 +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 AB15B611FB; Tue, 29 Mar 2016 06:45:39 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 40E4061103 for ; Tue, 29 Mar 2016 06:45:38 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id e133so4511032lfe.3 for ; Mon, 28 Mar 2016 23:45:38 -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; bh=7VPV6jV185Ey6JsTmlbkx2J/rBgz3XJGhV8D/9qD3aM=; b=W0VFvUhud+/o41K7fr4Ue7VttYjqYZf/Sd6f0Wff/aVf9x3kLLtfqlNp3h8cq8P3Ms +7pSp0bXkb/KTXttHUJFROPutlfMhOP6qHoXeu+0mHqTKDx9znHOFnHab46f8gSBox+U VdSziotylzx6n3inuo2sRIIMChCErEjZeXdMPyyT11o0Otnh4kXddUKpmlAcYRZar6YY AFcI91Z1sfCEisuhNaG8sS0hZO7koo7NxW6sIkkpwHQEesSqtADWWUmIz11HP2SN1nV9 v4fmMZJ+cP2+oW56wX1lBEkq2Nmb2kNWdPXBqKid99Hdpt+18O0KP0NOJB/N10ShUx/5 wE2A== X-Gm-Message-State: AD7BkJI8HDDK2VIgObJ5eSmeQmg9/oYXrry60zyF7m8Obr3kcbLAzEtNX8BgweuwTTmETA78e9k= X-Received: by 10.25.146.206 with SMTP id u197mr277885lfd.139.1459233937175; Mon, 28 Mar 2016 23:45:37 -0700 (PDT) Received: from localhost (c-c82171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.200]) by smtp.gmail.com with ESMTPSA id k190sm5074190lfb.20.2016.03.28.23.45.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Mar 2016 23:45:36 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Tue, 29 Mar 2016 08:38:17 +0200 Message-Id: <1459233497-29983-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 X-Topics: patch Subject: [lng-odp] [PATCH] pkgconfig: use main ODP version 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" pkgconfig version string to follow the main odp version, instead of the git snapshot string since pkg-config/lib consumers are concerned with the real upstream version. Signed-off-by: Anders Roxell --- configure.ac | 2 ++ pkgconfig/libodp-linux.pc.in | 2 +- pkgconfig/libodphelper-linux.pc.in | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index f443ce4..3cb5f1e 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,8 @@ AC_SUBST([ARCH]) AGE=0 ODP_LIBSO_VERSION=$(echo $VERSION.$AGE | awk -F . '{printf("%d:%d:%d\n", (($1 * 100) + $2), $3, $4)}') AC_SUBST(ODP_LIBSO_VERSION) +PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') +AC_SUBST(PKGCONFIG_VERSION) ########################################################################## # Determine which platform to build for diff --git a/pkgconfig/libodp-linux.pc.in b/pkgconfig/libodp-linux.pc.in index 946f11f..0769b21 100644 --- a/pkgconfig/libodp-linux.pc.in +++ b/pkgconfig/libodp-linux.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libodp-linux Description: The ODP packet processing engine -Version: @VERSION@ +Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodp-linux Libs.private: Cflags: -I${includedir} diff --git a/pkgconfig/libodphelper-linux.pc.in b/pkgconfig/libodphelper-linux.pc.in index 71c7d5d..3987f4c 100644 --- a/pkgconfig/libodphelper-linux.pc.in +++ b/pkgconfig/libodphelper-linux.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libodphelper-linux Description: Helper for the ODP packet processing engine -Version: @VERSION@ +Version: @PKGCONFIG_VERSION@ Libs: -L${libdir} -lodphelper-linux Libs.private: Cflags: -I${includedir}