verbs: Change the provider library file name suffix

Commit Message

Jason Gunthorpe Aug. 10, 2017, 8:36 p.m. UTC

On Thu, Aug 10, 2017 at 09:47:36AM +0300, Leon Romanovsky wrote:
> What do you think if we update it automatically?

Okay, but this is more robust, I updated the PR

From 1819eb861a0617ca02c1619b1c7569ec21158f64 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <[e-mail]>
Date: Thu, 10 Aug 2017 11:10:54 -0600
Subject: [PATCH] verbs: Use cmake substitution on libibverbs.map

This lets us have one less copy of the value in
IBVERBS_PABI_VERSION.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 libibverbs/CMakeLists.txt                        | 5 ++++-
 libibverbs/{libibverbs.map => libibverbs.map.in} | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename libibverbs/{libibverbs.map => libibverbs.map.in} (96%)

Comments

Leon Romanovsky Aug. 11, 2017, 10:54 a.m. UTC | #1

On Thu, Aug 10, 2017 at 02:36:15PM -0600, Jason Gunthorpe wrote:
> On Thu, Aug 10, 2017 at 09:47:36AM +0300, Leon Romanovsky wrote:
> > What do you think if we update it automatically?
>
> Okay, but this is more robust, I updated the PR
>

Thanks, indeed.

Patch

diff --git a/libibverbs/CMakeLists.txt b/libibverbs/CMakeLists.txt
index 7a52eddc810911..863c395df99d2b 100644
--- a/libibverbs/CMakeLists.txt
+++ b/libibverbs/CMakeLists.txt
@@ -18,7 +18,10 @@  else()
   set(NEIGH "")
 endif()
 
-rdma_library(ibverbs libibverbs.map
+configure_file("libibverbs.map.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map" @ONLY)
+
+rdma_library(ibverbs "${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map"
   # See Documentation/versioning.md
   1 1.1.${PACKAGE_VERSION}
   cmd.c
diff --git a/libibverbs/libibverbs.map b/libibverbs/libibverbs.map.in
similarity index 96%
rename from libibverbs/libibverbs.map
rename to libibverbs/libibverbs.map.in
index 56020d06a844b2..a1124421bf364d 100644
--- a/libibverbs/libibverbs.map
+++ b/libibverbs/libibverbs.map.in
@@ -85,8 +85,8 @@  IBVERBS_1.1 {
 /* NOTE: The next stanza for public symbols should be IBVERBS_1.4 due to release 12 */
 
 /* If any symbols in this stanza change ABI then the entire staza gets a new symbol
-   version. Also see the private_symver() macro */
-IBVERBS_PRIVATE_15 {
+   version. See the top level CMakeLists.txt for this setting. */
+IBVERBS_PRIVATE_@IBVERBS_PABI_VERSION@ {
 	global:
 		/* These historical symbols are now private to libibverbs */
 		ibv_cmd_alloc_mw;