diff --git a/src/Makefile b/src/Makefile index f5149bc5ef777faaf2cdd0c56169dd369281fc74..773ab1387666732dd02339ed5d843164433810dc 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 42e95ff97eb84202f820b9e774e6b76769aaa423..6cb851b0c2220bd16b6314058308d10607787fc0 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 734037df09cff49f3de971f80cf1ef0a39f2e941..a6e0f58cb4c73a61265f1c8c13b69d4ea6504536 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 bc2c0983f5b9b8bbe382e320ba39d1d1ae7ae489..82e230bec4d5f6f28c84826237283f4ea111cf9f 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 8ed513b26a33a45e38b2b4634acfd635d1f5f452..3c654ad9518f25edc2087aa5d28447553745c40f 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 9c446efe941a78901609c440641e4d3dc34104d2..a6feb61a4bf8349300b39e90e0a8020090091cd3 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}