1 |
robbat2 09/11/30 00:51:36 |
2 |
|
3 |
Added: lvm2-2.02.56-always-make-static-libdm.patch |
4 |
Log: |
5 |
Bug #276803: Always build static libdevicemapper for cryptsetup to optionally link to. Same behavior that sys-fs/devicemapper used to have. |
6 |
(Portage version: 2.2_rc51/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sys-fs/lvm2/files/lvm2-2.02.56-always-make-static-libdm.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/files/lvm2-2.02.56-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.56-always-make-static-libdm.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: lvm2-2.02.56-always-make-static-libdm.patch |
15 |
=================================================================== |
16 |
diff -Nuar LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in LVM2.2.02.56/daemons/dmeventd/Makefile.in |
17 |
--- LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in 2009-11-29 16:42:25.208865445 -0800 |
18 |
+++ LVM2.2.02.56/daemons/dmeventd/Makefile.in 2009-11-29 16:45:18.904491124 -0800 |
19 |
@@ -26,11 +26,11 @@ |
20 |
INSTALL_DMEVENTD_TARGETS = install_dmeventd_dynamic |
21 |
INSTALL_LIB_TARGETS = install_lib_dynamic |
22 |
|
23 |
+LIB_STATIC = libdevmapper-event.a |
24 |
+INSTALL_LIB_TARGETS += install_lib_static |
25 |
ifeq ("@STATIC_LINK@", "yes") |
26 |
- LIB_STATIC = libdevmapper-event.a |
27 |
TARGETS += dmeventd.static |
28 |
INSTALL_DMEVENTD_TARGETS += install_dmeventd_static |
29 |
- INSTALL_LIB_TARGETS += install_lib_static |
30 |
endif |
31 |
|
32 |
LIB_VERSION = $(LIB_VERSION_DM) |
33 |
diff -Nuar LVM2.2.02.56.orig/libdm/Makefile.in LVM2.2.02.56/libdm/Makefile.in |
34 |
--- LVM2.2.02.56.orig/libdm/Makefile.in 2009-10-02 12:10:36.000000000 -0700 |
35 |
+++ LVM2.2.02.56/libdm/Makefile.in 2009-11-29 16:44:30.552491107 -0800 |
36 |
@@ -35,9 +35,9 @@ |
37 |
|
38 |
INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir) |
39 |
|
40 |
-ifeq ("@STATIC_LINK@", "yes") |
41 |
LIB_STATIC = $(interface)/libdevmapper.a |
42 |
+ifeq ("@STATIC_LINK@", "yes") |
43 |
endif |
44 |
|
45 |
ifeq ("@LIB_SUFFIX@","dylib") |
46 |
LIB_SHARED = $(interface)/libdevmapper.dylib |
47 |
@@ -60,9 +60,9 @@ |
48 |
|
49 |
INSTALL_TYPE = install_dynamic |
50 |
|
51 |
-ifeq ("@STATIC_LINK@", "yes") |
52 |
INSTALL_TYPE += install_static |
53 |
+ifeq ("@STATIC_LINK@", "yes") |
54 |
endif |
55 |
|
56 |
ifeq ("@PKGCONFIG@", "yes") |
57 |
INSTALL_TYPE += install_pkgconfig |