Browse Source

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.

Guillem Jover 20 years ago
parent
commit
55a257af3c
4 changed files with 16 additions and 3 deletions
  1. 9 0
      ChangeLog
  2. 4 0
      debian/changelog
  3. 1 1
      debian/control
  4. 2 2
      m4/libs.m4

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2006-02-08  Guillem Jover  <guillem@debian.org>
+
+	* 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  <nicolas.francois@centraliens.net>
 
 	* man/C/dselect.1: Fix a typo: replace '.sh' by '.sp'.

+ 4 - 0
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

+ 1 - 1
debian/control

@@ -6,7 +6,7 @@ Uploaders: Frank Lichtenheld <djpig@debian.org>, Guillem Jover <guillem@debian.o
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 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

+ 2 - 2
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"],