From: Guillem Jover Date: Wed, 8 Feb 2006 04:16:41 +0000 (+0000) Subject: Use pkg-config to get the proper flags to link against libselinux. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a257af3c95fbfa188a7b8b8344151bacccb713;p=dpkg Use pkg-config to get the proper flags to link against libselinux. Add a Build-Dependency on pkg-config, thighten libselinux1-dev to at least version 1.28-4 which provides a .pc file, and remove libsepol1-dev as libselinux1-dev is Depending on it. --- diff --git a/ChangeLog b/ChangeLog index 8c45170d..86a72af2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-08 Guillem Jover + + * debian/contrl (Build-Depends): Depend on version >= 1.28-4 of + libselinux1-dev as it has pkg-config support. Remove libsepol1-dev, + now dragged by libselinux1-dev. Add pkg-config. + * m4/libs.m4 (DPKG_LIB_SELINUX): Use pkg-config to get the static + and dynamic linker flags, thus no more hardcoding the transitional + libraries. + 2006-02-07 Nicolas François * man/C/dselect.1: Fix a typo: replace '.sh' by '.sp'. diff --git a/debian/changelog b/debian/changelog index 85896057..5b50be65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ dpkg (1.13.14~) UNRELEASED; urgency=low Thanks to Changwoo Ryu for noticing. Closes: #237915 * Mark some strings as translatable (Changwoo Ryu). Closes: #256387 * Remove a trailing 'C' character from update-alternatives manpage. + * Use pkg-config to get the proper flags to link against libselinux. + Add a Build-Dependency on pkg-config, thighten libselinux1-dev to + at least version 1.28-4 which provides a .pc file, and remove + libsepol1-dev as libselinux1-dev is Depending on it. [ Frank Lichtenheld ] * Let dpkg-source ignore comments in the hunk header as used by diff --git a/debian/control b/debian/control index 8bfa4cdd..93ec19f9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Frank Lichtenheld , Guillem Jover = 4.1.81), libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libsepol1-dev [!hurd-i386 !kfreebsd-i386], libselinux1-dev [!hurd-i386 !kfreebsd-i386], po4a +Build-Depends: debhelper (>= 4.1.81), pkg-config, libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386], po4a Package: dpkg Architecture: any diff --git a/m4/libs.m4 b/m4/libs.m4 index 74644980..f834026e 100644 --- a/m4/libs.m4 +++ b/m4/libs.m4 @@ -71,9 +71,9 @@ if test "x$with_selinux" != "xno"; then [AC_DEFINE(WITH_SELINUX, 1, [Define to 1 to compile in SELinux supoprt]) if test "x$with_selinux" = "xstatic"; then - dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol -Wl,-Bdynamic" + dpkg_selinux_libs="-Wl,-Bstatic `pkg-config --static --libs libselinux` -Wl,-Bdynamic" else - dpkg_selinux_libs="-lselinux" + dpkg_selinux_libs="`pkg-config --libs libselinux`" fi SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS }$dpkg_selinux_libs" with_selinux="yes"],