From c164f11ef8508fc5a9f3aee92c343a453fb9246b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Wed, 10 Jul 2019 20:30:06 +0200
Subject: [PATCH] common: support older versions of pkg-config
Older pkg-config (at least 0.27.1) doesn't support multiple
Requires.private's in a single file.
---
src/Makefile | 2 +-
src/common.inc | 2 ++
utils/libpmemblk.pc.in | 3 +--
utils/libpmemlog.pc.in | 3 +--
utils/libpmemobj.pc.in | 3 +--
utils/libpmempool.pc.in | 3 +--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index f5149bc5e..773ab1387 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -139,7 +139,7 @@ libpmemblk libpmemlog libpmemobj: libpmem
benchmarks test tools: common
pkg-cfg-common:
- @printf "version=%s\nlibdir=%s\nprefix=%s\nrasdeps=%s\n" "$(SRCVERSION)" "$(libdir)" "$(prefix)" "$(LIBNDCTL_PKG_CONFIG_DEPS)" > $(PKG_CONFIG_COMMON)
+ @printf "version=%s\nlibdir=%s\nprefix=%s\nrasdeps=%s\n" "$(SRCVERSION)" "$(libdir)" "$(prefix)" "$(LIBNDCTL_PKG_CONFIG_DEPS_VAR)" > $(PKG_CONFIG_COMMON)
$(PKG_CONFIG_COMMON): pkg-cfg-common
diff --git a/src/common.inc b/src/common.inc
index 42e95ff97..6cb851b0c 100644
--- a/src/common.inc
+++ b/src/common.inc
@@ -390,6 +390,7 @@ ifeq ($(NDCTL_ENABLE),y)
$(error libdaxctl(version >= $(NDCTL_MIN_VERSION)) is missing -- see README)
endif
LIBNDCTL_PKG_CONFIG_DEPS := libndctl libdaxctl
+ LIBNDCTL_PKG_CONFIG_DEPS_VAR := ,libndctl,libdaxctl
LIBNDCTL_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LIBNDCTL_PKG_CONFIG_DEPS))
LIBNDCTL_LD_LIBRARY_PATHS := $(shell $(PKG_CONFIG) --variable=libdir $(LIBNDCTL_PKG_CONFIG_DEPS) | sed "s/ /:/")
LIBNDCTL_LIBS := $(shell $(PKG_CONFIG) --libs $(LIBNDCTL_PKG_CONFIG_DEPS))
@@ -400,6 +401,7 @@ else
endif
export OS_DIMM
export LIBNDCTL_PKG_CONFIG_DEPS
+export LIBNDCTL_PKG_CONFIG_DEPS_VAR
export LIBNDCTL_CFLAGS
export LIBNDCTL_LD_LIBRARY_PATHS
export LIBNDCTL_LIBS
diff --git a/utils/libpmemblk.pc.in b/utils/libpmemblk.pc.in
index 734037df0..a6e0f58cb 100644
--- a/utils/libpmemblk.pc.in
+++ b/utils/libpmemblk.pc.in
@@ -4,7 +4,6 @@ Name: libpmemblk
Description: libpmemblk library from PMDK project
Version: ${version}
URL: http://pmem.io/pmdk
-Requires.private: libpmem
-Requires.private: ${rasdeps}
+Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmemblk
Cflags: -I${includedir}
diff --git a/utils/libpmemlog.pc.in b/utils/libpmemlog.pc.in
index bc2c0983f..82e230bec 100644
--- a/utils/libpmemlog.pc.in
+++ b/utils/libpmemlog.pc.in
@@ -4,7 +4,6 @@ Name: libpmemlog
Description: libpmemlog library from PMDK project
Version: ${version}
URL: http://pmem.io/pmdk
-Requires.private: libpmem
-Requires.private: ${rasdeps}
+Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmemlog
Cflags: -I${includedir}
diff --git a/utils/libpmemobj.pc.in b/utils/libpmemobj.pc.in
index 8ed513b26..3c654ad95 100644
--- a/utils/libpmemobj.pc.in
+++ b/utils/libpmemobj.pc.in
@@ -4,8 +4,7 @@ Name: libpmemobj
Description: libpmemobj library from PMDK project
Version: ${version}
URL: http://pmem.io/pmdk
-Requires.private: libpmem
-Requires.private: ${rasdeps}
+Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmemobj
Libs.private: -ldl
Cflags: -I${includedir}
diff --git a/utils/libpmempool.pc.in b/utils/libpmempool.pc.in
index 9c446efe9..a6feb61a4 100644
--- a/utils/libpmempool.pc.in
+++ b/utils/libpmempool.pc.in
@@ -4,8 +4,7 @@ Name: libpmempool
Description: libpmempool library from PMDK project
Version: ${version}
URL: http://pmem.io/pmdk
-Requires.private: libpmem
-Requires.private: ${rasdeps}
+Requires.private: libpmem${rasdeps}
Libs: -L${libdir} -lpmempool
Libs.private: -ldl
Cflags: -I${includedir}
--
GitLab