r811 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Wed May 19 11:56:12 2010
New Revision: 811

Log:
debian/patches/libs-cleanup.patch: Remove large parts.

Modified:
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 11:20:40 2010	(r810)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Wed May 19 11:56:12 2010	(r811)
@@ -34,8 +34,8 @@
 -		SELINUX_LIBS=
 -		HAVE_SELINUX=no ])
 +	AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	LDFLAGS_SELINUX="$(pkg-config --libs libselinux)"
-+	LDFLAGS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
++	SELINUX_LIBS="$(pkg-config --libs libselinux)"
++	SELINUX_LIBS_STATIC="$(pkg-config --libs --static libselinux)"
  fi
  
  ################################################################################
@@ -94,80 +94,16 @@
  dnl -- Ensure additional headers required
  if test x$READLINE = xyes; then
 -	AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out))
-+	AC_CHECK_LIB([readline], [readline], [LDFLAGS_READLINE="-lreadline"], AC_MSG_ERROR(bailing out))
++	AC_CHECK_LIB([readline], [readline], [READLINE_LIBS="-lreadline"], AC_MSG_ERROR(bailing out))
 +	AC_DEFINE([READLINE_SUPPORT], 1, [Define to 1 to include the LVM readline shell.])
  fi
  
  if test x$CLVMD != xnone; then
-@@ -1093,6 +1041,9 @@
- AC_SUBST(JOBS)
- AC_SUBST(LDDEPS)
- AC_SUBST(LIBS)
-+AC_SUBST(LDFLAGS_READLINE)
-+AC_SUBST(LDFLAGS_SELINUX)
-+AC_SUBST(LDFLAGS_SELINUX_STATIC)
- AC_SUBST(LIB_SUFFIX)
- AC_SUBST(LOCALEDIR)
- AC_SUBST(LVM1)
---- a/daemons/dmeventd/Makefile.in
-+++ b/daemons/dmeventd/Makefile.in
-@@ -53,11 +53,12 @@
- all: device-mapper
- device-mapper: $(TARGETS)
- 
-+CLDFLAGS += -ldevmapper
- LVMLIBS += -ldevmapper-event -ldevmapper $(PTHREAD_LIBS)
- 
- dmeventd: $(LIB_SHARED) dmeventd.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
--	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
-+	$(DL_LIBS) $(LVMLIBS) $(LIBS)
- 
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
---- a/libdm/Makefile.in
-+++ b/libdm/Makefile.in
-@@ -47,6 +47,8 @@
- 
- include $(top_builddir)/make.tmpl
- 
-+LDFLAGS += @LDFLAGS_SELINUX@
-+
- DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
- 	-DDM_DEVICE_MODE=@DM_DEVICE_MODE@
- 
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -127,7 +127,6 @@
- #DEFS += -DBOUNDS_CHECK
- 
- #CFLAGS += -pg
--#LDFLAGS += -pg
- 
- STRIP=
- #STRIP = -s
-@@ -283,11 +282,11 @@
- $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS)
- ifeq ("@LIB_SUFFIX@","so")
- 	$(CC) -shared -Wl,-soname,$(notdir $@) \
--		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
- endif
- ifeq ("@LIB_SUFFIX@","dylib")
- 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
--		$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+		$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
- endif
- 
- $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -104,7 +104,7 @@
- 	LVMLIBS += -ldevmapper-event
- endif
- 
--LVMLIBS += -ldevmapper
-+LVMLIBS += -ldevmapper @LDFLAGS_READLINE@
- 
- DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
- 
+@@ -1117,6 +1065,7 @@
+ AC_SUBST(SALCK_CFLAGS)
+ AC_SUBST(SALCK_LIBS)
+ AC_SUBST(SELINUX_LIBS)
++AC_SUBST(SELINUX_LIBS_STATIC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
+ AC_SUBST(STATIC_LINK)