- updated for 1.02.23

[packages/device-mapper.git] / device-mapper-disable_dynamic_link.patch

diff --git a/device-mapper-disable_dynamic_link.patch b/device-mapper-disable_dynamic_link.patch
index 6994cf4f46816601823565201dd08da04e2719d0..010448e23d8e3f3a57206de9cd5c2caa8c27ede0 100644 (file)
--- a/device-mapper-disable_dynamic_link.patch
+++ b/device-mapper-disable_dynamic_link.patch
@@ -18,9 +18,8 @@ diff -durN -x '*~' device-mapper.1.01.03.orig/configure.in device-mapper.1.01.03
  AC_SUBST(OWNER)
  AC_SUBST(GROUP)
  AC_SUBST(LIBS)
-diff -durN -x '*~' device-mapper.1.01.03.orig/dmsetup/Makefile.in device-mapper.1.01.03/dmsetup/Makefile.in
---- device-mapper.1.01.03.orig/dmsetup/Makefile.in     2005-01-27 17:16:52.000000000 +0100
-+++ device-mapper.1.01.03/dmsetup/Makefile.in  2005-07-31 19:10:13.000000000 +0200
+--- device-mapper.1.02.23/dmsetup/Makefile.in.orig     2007-08-21 22:32:30.000000000 +0200
++++ device-mapper.1.02.23/dmsetup/Makefile.in  2007-12-16 23:07:07.095562047 +0100
 @@ -16,8 +16,10 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -29,9 +28,9 @@ diff -durN -x '*~' device-mapper.1.01.03.orig/dmsetup/Makefile.in device-mapper.
  TARGETS = dmsetup
  INSTALL_TYPE = install_dynamic
 +endif
+ LIB_PTHREAD = @LIB_PTHREAD@
  
  ifeq ("@STATIC_LINK@", "yes")
-   TARGETS += dmsetup.static
 diff -durN -x '*~' device-mapper.1.01.03.orig/lib/Makefile.in device-mapper.1.01.03/lib/Makefile.in
 --- device-mapper.1.01.03.orig/lib/Makefile.in 2005-04-28 00:32:00.000000000 +0200
 +++ device-mapper.1.01.03/lib/Makefile.in      2005-07-31 19:10:13.000000000 +0200
@@ -45,14 +44,14 @@ diff -durN -x '*~' device-mapper.1.01.03.orig/lib/Makefile.in device-mapper.1.01
  
  ifeq ("@STATIC_LINK@", "yes")
    INSTALL_TYPE += install_static
---- device-mapper.1.02.07/make.tmpl.in.orig    2006-05-10 21:38:25.000000000 +0200
-+++ device-mapper.1.02.07/make.tmpl.in 2006-05-17 19:11:38.814962000 +0200
+--- device-mapper.1.02.23/make.tmpl.in.orig    2007-10-03 12:48:27.000000000 +0200
++++ device-mapper.1.02.23/make.tmpl.in 2007-12-16 23:06:42.922184485 +0100
 @@ -123,7 +123,11 @@
  .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
  .PHONY: $(SUBDIRS.pofile)
  
 +ifeq ("@DYNAMIC_LINK@", "yes")
- TARGETS += $(LIB_SHARED) $(LIB_STATIC)
+ TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
 +else
 +TARGETS += $(LIB_STATIC)
 +endif