Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2/files: lvm2-2.02.63-always-make-static-libdm.patch
Date: Tue, 20 Apr 2010 02:58:04
Message-Id: 20100420025801.4504B2C04B@corvid.gentoo.org
1 robbat2 10/04/20 02:58:01
2
3 Added: lvm2-2.02.63-always-make-static-libdm.patch
4 Log:
5 Bug #309757, version bump. Now dropping the export-format patchset entirely in favour of new lvm2/udev cookie and udev rules from upstream. This may require us to set a minimum kernel version.
6 (Portage version: 2.2_rc67/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch?rev=1.1&content-type=text/plain
13
14 Index: lvm2-2.02.63-always-make-static-libdm.patch
15 ===================================================================
16 diff -Nuar --exclude '*~' LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in LVM2.2.02.63/daemons/dmeventd/Makefile.in
17 --- LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in 2010-04-09 14:42:48.000000000 -0700
18 +++ LVM2.2.02.63/daemons/dmeventd/Makefile.in 2010-04-19 11:53:27.000000000 -0700
19 @@ -28,11 +28,12 @@
20 INSTALL_LIB_TARGETS = install_lib_dynamic
21
22 LIB_NAME = libdevmapper-event
23 +LIB_STATIC = $(LIB_NAME).a
24 +INSTALL_LIB_TARGETS += install_lib_static
25 +TARGETS += $(LIB_STATIC)
26 ifeq ("@STATIC_LINK@", "yes")
27 - LIB_STATIC = $(LIB_NAME).a
28 - TARGETS += $(LIB_STATIC) dmeventd.static
29 + TARGETS += dmeventd.static
30 INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
31 - INSTALL_LIB_TARGETS += install_lib_static
32 endif
33
34 LIB_VERSION = $(LIB_VERSION_DM)
35 diff -Nuar --exclude '*~' LVM2.2.02.63.orig/libdm/Makefile.in LVM2.2.02.63/libdm/Makefile.in
36 --- LVM2.2.02.63.orig/libdm/Makefile.in 2010-04-09 14:42:51.000000000 -0700
37 +++ LVM2.2.02.63/libdm/Makefile.in 2010-04-19 11:52:20.000000000 -0700
38 @@ -34,8 +34,8 @@
39
40 INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
41
42 -ifeq ("@STATIC_LINK@", "yes")
43 LIB_STATIC = $(interface)/libdevmapper.a
44 +ifeq ("@STATIC_LINK@", "yes")
45 endif
46
47 LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
48 @@ -63,8 +63,8 @@
49
50 INSTALL_TYPE = install_dynamic
51
52 -ifeq ("@STATIC_LINK@", "yes")
53 INSTALL_TYPE += install_static
54 +ifeq ("@STATIC_LINK@", "yes")
55 endif
56
57 ifeq ("@PKGCONFIG@", "yes")