shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

libdm: pkgconfig: fix devmapper.pc to not reference nonexistent rt.pc file

Browse Source 
librt doesn't have a pkgconfig file so use Libs.private: -lrt instead
to declare the dependency directly.

The same applies for -lm which is also used and which hasn't been
defined in the devmapper.pc file yet.
This commit is contained in:
Peter Rajnoha 2015-09-03 09:28:42 +02:00
parent b86bd3b074
commit fc35b6988d
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.107 - Version 1.02.107 -
=================================== ===================================
Fix devmapper.pc pkgconfig file to not reference non-existent rt.pc file.
Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106) Reinstate dm_task_get_info@Base to libdevmapper exports. (1.02.106)
Version 1.02.106 - 26th August 2015 Version 1.02.106 - 26th August 2015

4
configure vendored
View File

@ -659,7 +659,7 @@ SELINUX_PC
SELINUX_LIBS SELINUX_LIBS
REPLICATORS REPLICATORS
READLINE_LIBS READLINE_LIBS
RT_PC RT_LIB
RAID RAID
PYTHON_LIBDIRS PYTHON_LIBDIRS
PYTHON_INCDIRS PYTHON_INCDIRS
@ -12847,7 +12847,7 @@ fi
$as_echo "#define HAVE_REALTIME 1" >>confdefs.h $as_echo "#define HAVE_REALTIME 1" >>confdefs.h
LIBS="-lrt $LIBS" LIBS="-lrt $LIBS"
RT_PC="librt" RT_LIB="-lrt"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling realtime clock" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling realtime clock" >&5
$as_echo "$as_me: WARNING: Disabling realtime clock" >&2;} $as_echo "$as_me: WARNING: Disabling realtime clock" >&2;}

4
configure.in
View File

@ -1581,7 +1581,7 @@ if test "$REALTIME" = yes; then
if test "$HAVE_REALTIME" = yes; then if test "$HAVE_REALTIME" = yes; then
AC_DEFINE([HAVE_REALTIME], 1, [Define to 1 to include support for realtime clock.]) AC_DEFINE([HAVE_REALTIME], 1, [Define to 1 to include support for realtime clock.])
LIBS="-lrt $LIBS" LIBS="-lrt $LIBS"
RT_PC="librt" RT_LIB="-lrt"
else else
AC_MSG_WARN(Disabling realtime clock) AC_MSG_WARN(Disabling realtime clock)
fi fi
@ -1995,7 +1995,7 @@ AC_SUBST(PYTHON_LIBDIRS)
AC_SUBST(QUORUM_CFLAGS) AC_SUBST(QUORUM_CFLAGS)
AC_SUBST(QUORUM_LIBS) AC_SUBST(QUORUM_LIBS)
AC_SUBST(RAID) AC_SUBST(RAID)
AC_SUBST(RT_PC) AC_SUBST(RT_LIB)
AC_SUBST(READLINE_LIBS) AC_SUBST(READLINE_LIBS)
AC_SUBST(REPLICATORS) AC_SUBST(REPLICATORS)
AC_SUBST(SACKPT_CFLAGS) AC_SUBST(SACKPT_CFLAGS)

3
libdm/libdevmapper.pc.in
View File

@ -8,4 +8,5 @@ Description: device-mapper library
Version: @DM_LIB_PATCHLEVEL@ Version: @DM_LIB_PATCHLEVEL@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -ldevmapper Libs: -L${libdir} -ldevmapper
Requires.private: @SELINUX_PC@ @UDEV_PC@ @RT_PC@ Requires.private: @SELINUX_PC@ @UDEV_PC@
Libs.private: -lm @RT_LIB@