[gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch

[Robin H. Johnson (robbat2)]

robbat2     09/11/29 23:44:25

  Added:                lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
  Log:
  Try a different combined fix for bug #291217 (selinux compile) and bug #293272 (parallel compile fix) that should work better than the previous revisions.
  (Portage version: 2.2_rc51/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch?rev=1.1&content-type=text/plain

Index: lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
===================================================================
diff -Nuar LVM2.2.02.51.orig/tools/Makefile.in LVM2.2.02.51/tools/Makefile.in
--- LVM2.2.02.51.orig/tools/Makefile.in	2009-11-29 22:41:54.008495958 +0000
+++ LVM2.2.02.51/tools/Makefile.in	2009-11-29 22:44:40.207625943 +0000
@@ -98,6 +98,7 @@
 endif
 
 LVMLIBS += -ldevmapper
+SELINUX_LIBS += @SELINUX_LIBS@
 
 DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
 
@@ -109,13 +110,13 @@
 	$(CC) $(CFLAGS) $(LDFLAGS) \
 	      -L$(top_srcdir)/libdm \
 		  -o $@ dmsetup.o \
-		  -ldevmapper $(LIB_PTHREAD)
+		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
 
 dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -static \
 	      -L$(interfacedir) \
 		  -o $@ dmsetup.o \
-		  -ldevmapper $(LIB_PTHREAD)
+		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
 
 all: device-mapper