r669 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 14:39:03 2009
New Revision: 669

Log:
* debian/patches/drop-realtime.patch: Update.
* debian/patches/libs-cleanup.patch: Only link libreadlin into lvm.


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

Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch	(original)
+++ lvm2/trunk/debian/patches/drop-realtime.patch	Mon Feb 23 14:39:03 2009
@@ -179,7 +179,7 @@
 -
 --- a/configure.in
 +++ b/configure.in
-@@ -39,7 +39,6 @@
+@@ -38,7 +38,6 @@
  		ODIRECT=yes
  		DM_IOCTLS=yes
  		SELINUX=yes
@@ -187,7 +187,7 @@
  		CLUSTER=internal
  		FSADM=yes
  		;;
-@@ -54,7 +53,6 @@
+@@ -53,7 +52,6 @@
  		ODIRECT=no
  		DM_IOCTLS=no
  		SELINUX=no
@@ -195,7 +195,7 @@
  		CLUSTER=none
  		FSADM=no
  		;;
-@@ -314,13 +312,6 @@
+@@ -313,13 +311,6 @@
  AC_MSG_RESULT($READLINE)
  
  ################################################################################
@@ -209,7 +209,7 @@
  dnl -- Build cluster LVM daemon
  AC_MSG_CHECKING(whether to build cluster LVM daemon)
  AC_ARG_WITH(clvmd,
-@@ -547,19 +538,6 @@
+@@ -532,19 +523,6 @@
  fi
  
  ################################################################################
@@ -229,7 +229,7 @@
  dnl -- Check for getopt
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
  
-@@ -737,7 +715,6 @@
+@@ -722,7 +700,6 @@
  AC_SUBST(FSADM)
  AC_SUBST(GROUP)
  AC_SUBST(HAVE_LIBDL)

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	(original)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Feb 23 14:39:03 2009
@@ -8,6 +8,15 @@
  		LIB_SUFFIX=so
  		DEVMAPPER=yes
  		ODIRECT=yes
+@@ -482,7 +481,7 @@
+ dnl -- Check for termcap (Shamelessly copied from parted 1.4.17)
+ if test x$READLINE != xno; then
+ 	AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses termcap termlib],
+-	  [tg_found=yes], [tg_found=no])
++	  [tg_found=yes; LIBS_READLINE="$LIBS"; LIBS=""], [tg_found=no])
+ 	test x$READLINE:$tg_found = xyes:no &&
+ 	  AC_MSG_ERROR(
+ termcap could not be found which is required for the
 @@ -527,34 +526,9 @@
  ################################################################################
  dnl -- Check for selinux
@@ -46,16 +55,26 @@
  fi
  
  ################################################################################
-@@ -755,6 +729,8 @@
+@@ -578,7 +552,7 @@
+ dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
+ if test x$READLINE != xno; then
+ 	rl_found=yes
+-	AC_CHECK_LIB([readline], [readline], , [rl_found=no])
++	AC_CHECK_LIB([readline], [readline], [LIBS_READLINE="-lreadline $LIBS_READLINE"], [rl_found=no])
+ 	test x$READLINE:$rl_found = xyes:no &&
+ 	  AC_MSG_ERROR(
+ GNU Readline could not be found which is required for the
+@@ -755,6 +729,9 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
  AC_SUBST(LIBS)
++AC_SUBST(LIBS_READLINE)
 +AC_SUBST(LIBS_SELINUX)
 +AC_SUBST(LIBS_SELINUX_STATIC)
  AC_SUBST(LIB_SUFFIX)
  AC_SUBST(LOCALEDIR)
  AC_SUBST(LVM1)
-@@ -769,7 +745,6 @@
+@@ -769,7 +746,6 @@
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)
  AC_SUBST(STATIC_LINK)
@@ -78,16 +97,17 @@
  }
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -95,6 +95,8 @@
+@@ -95,6 +95,9 @@
  
  LVMLIBS += -ldevmapper
  
 +LDFLAGS_DMSETUP_STATIC = @LIBS_SELINUX_STATIC@
++LDFLAGS_LVM = @LIBS_READLINE@
 +
  DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
  
  include $(top_srcdir)/make.tmpl
-@@ -107,8 +109,7 @@
+@@ -107,14 +110,13 @@
  
  dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
  	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
@@ -97,6 +117,13 @@
  
  all: device-mapper
  
+ lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
+ 	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
+-		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
++		$(LDFLAGS) $(LVMLIBS) $(LDFLAGS_LVM) -rdynamic
+ 
+ LIB_PTHREAD = @LIB_PTHREAD@
+ lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
 --- a/daemons/dmeventd/Makefile.in
 +++ b/daemons/dmeventd/Makefile.in
 @@ -44,7 +44,7 @@