[gentoo-commits] proj/genkernel:master commit in: patches/lvm/2.02.173/, patches/lvm/2.02.88/, patches/lvm/2.02.28/, ... - gentoo-commits

From:	"Robin H. Johnson" <robbat2@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/genkernel:master commit in: patches/lvm/2.02.173/, patches/lvm/2.02.88/, patches/lvm/2.02.28/, ...
Date:	Sun, 03 Sep 2017 04:46:08
Message-Id:	`1504413919.562ff4565b70c36e5092759881cb1fe504a342a0.robbat2@gentoo`

1

commit:     562ff4565b70c36e5092759881cb1fe504a342a0

2

Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

3

AuthorDate: Sun Sep  3 04:45:19 2017 +0000

4

Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

5

CommitDate: Sun Sep  3 04:45:19 2017 +0000

6

URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=562ff456

7

8

lvm2: bump.

9

10

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

11

12

 .../lvm2-2.02.139-dynamic-static-ldflags.patch     | 63 ++++++++++++++++++++++

13

 .../lvm/2.02.28/filter-sysfs-inc-sys-stat.patch    | 11 ----

14

 patches/lvm/2.02.28/no-export-dynamic.patch        | 22 --------

15

 .../2.02.74/lvm2-2.02.72-no-export-dynamic.patch   | 37 -------------

16

 .../2.02.88/lvm2-2.02.72-no-export-dynamic.patch   | 37 -------------

17

 5 files changed, 63 insertions(+), 107 deletions(-)

18

19

diff --git a/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch

20

new file mode 100644

21

index 0000000..312e546

22

--- /dev/null

23

+++ b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch

24

@@ -0,0 +1,63 @@

25

+diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in

26

+--- LVM2.2.02.139_O/configure.in	2016-01-19 12:54:33.155187005 +0000

27

++++ LVM2.2.02.139/configure.in	2016-01-19 12:56:39.487181372 +0000

28

+@@ -31,6 +31,7 @@

29

+ 	linux*)

30

+ 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"

31

+ 		ELDFLAGS="-Wl,--export-dynamic"

32

++		STATIC_LDFLAGS="-Wl,--no-export-dynamic"

33

+ 		# FIXME Generate list and use --dynamic-list=.dlopen.sym

34

+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"

35

+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"

36

+@@ -2009,6 +2010,7 @@

37

+ AC_SUBST(SELINUX_PC)

38

+ AC_SUBST(SNAPSHOTS)

39

+ AC_SUBST(STATICDIR)

40

++AC_SUBST(STATIC_LDFLAGS)

41

+ AC_SUBST(STATIC_LINK)

42

+ AC_SUBST(TESTING)

43

+ AC_SUBST(TESTSUITE_DATA)

44

+diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in LVM2.2.02.139/daemons/dmeventd/Makefile.in

45

+--- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in	2016-01-19 12:54:33.278186999 +0000

46

++++ LVM2.2.02.139/daemons/dmeventd/Makefile.in	2016-01-19 12:57:44.277178484 +0000

47

+@@ -67,7 +67,7 @@

48

+ 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic

49

+

50

+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a

51

+-	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \

52

++	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \

53

+ 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)

54

+

55

+ ifeq ("@PKGCONFIG@", "yes")

56

+diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in

57

+--- LVM2.2.02.139_O/make.tmpl.in	2016-01-19 12:54:33.529186988 +0000

58

++++ LVM2.2.02.139/make.tmpl.in	2016-01-19 12:58:31.514176378 +0000

59

+@@ -49,6 +49,7 @@

60

+ # FIXME set this only where it's needed, not globally?

61

+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@

62

+ LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@

63

++STATIC_LDFLAGS += @STATIC_LDFLAGS@

64

+ CLDFLAGS += @CLDFLAGS@

65

+ ELDFLAGS += @ELDFLAGS@

66

+ LDDEPS += @LDDEPS@

67

+diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in

68

+--- LVM2.2.02.139_O/tools/Makefile.in	2016-01-08 18:51:21.000000000 +0000

69

++++ LVM2.2.02.139/tools/Makefile.in	2016-01-19 13:00:08.349172060 +0000

70

+@@ -129,7 +129,7 @@

71

+ 	      -o $@ dmsetup.o -ldevmapper $(LIBS)

72

+

73

+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a

74

+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \

75

++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \

76

+ 	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)

77

+

78

+ all: device-mapper

79

+@@ -146,7 +146,7 @@

80

+ endif

81

+

82

+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a

83

+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \

84

++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \

85

+ 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)

86

+

87

+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o

88

89

diff --git a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch b/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch

90

deleted file mode 100644

91

index 2988e92..0000000

92

--- a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch

93

+++ /dev/null

94

@@ -1,11 +0,0 @@

95

-diff -ur LVM2.2.02.28/lib/filters/filter-sysfs.c LVM2.2.02.28.new/lib/filters/filter-sysfs.c

96

---- LVM2.2.02.28/lib/filters/filter-sysfs.c	2007-08-22 16:38:16.000000000 +0200

97

-+++ LVM2.2.02.28.new/lib/filters/filter-sysfs.c	2011-01-13 20:45:38.751542669 +0100

98

-@@ -15,6 +15,7 @@

99

- #include "lib.h"

100

- #include "filter-sysfs.h"

101

- #include "lvm-string.h"

102

-+#include <sys/stat.h>

103

-

104

- #ifdef linux

105

-

106

107

diff --git a/patches/lvm/2.02.28/no-export-dynamic.patch b/patches/lvm/2.02.28/no-export-dynamic.patch

108

deleted file mode 100644

109

index 19a4e13..0000000

110

--- a/patches/lvm/2.02.28/no-export-dynamic.patch

111

+++ /dev/null

112

@@ -1,22 +0,0 @@

113

-diff -ur LVM2.2.02.28/configure LVM2.2.02.28.new/configure

114

---- LVM2.2.02.28/configure	2007-08-14 20:58:30.000000000 +0200

115

-+++ LVM2.2.02.28.new/configure	2011-01-13 20:45:08.429184861 +0100

116

-@@ -1949,7 +1949,6 @@

117

- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"

118

- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"

119

- 		LDDEPS="$LDDEPS .export.sym"

120

--		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

121

- 		LIB_SUFFIX="so"

122

- 		DEVMAPPER=yes

123

- 		ODIRECT=yes

124

-diff -ur LVM2.2.02.28/configure.in LVM2.2.02.28.new/configure.in

125

---- LVM2.2.02.28/configure.in	2007-08-14 20:58:31.000000000 +0200

126

-+++ LVM2.2.02.28.new/configure.in	2011-01-13 20:45:14.365688659 +0100

127

-@@ -38,7 +38,6 @@

128

- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"

129

- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"

130

- 		LDDEPS="$LDDEPS .export.sym"

131

--		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

132

- 		LIB_SUFFIX="so"

133

- 		DEVMAPPER=yes

134

- 		ODIRECT=yes

135

136

diff --git a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch

137

deleted file mode 100644

138

index 05c7bf3..0000000

139

--- a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch

140

+++ /dev/null

141

@@ -1,37 +0,0 @@

142

-X-Gentoo-Bug: 332905

143

-X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view

144

-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905

145

-

146

-diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in

147

---- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in	2010-05-14 16:36:56.000000000 +0300

148

-+++ LVM2.2.02.72/daemons/dmeventd/Makefile.in	2010-08-17 03:00:24.000000000 +0300

149

-@@ -61,7 +61,7 @@

150

- 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic

151

-

152

- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a

153

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \

154

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L. -L$(interfacebuilddir) -o $@ \

155

- 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)

156

-

157

- ifeq ("@PKGCONFIG@", "yes")

158

-diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in

159

---- LVM2.2.02.72.orig/tools/Makefile.in	2010-06-25 21:23:10.000000000 +0300

160

-+++ LVM2.2.02.72/tools/Makefile.in	2010-08-17 03:01:07.000000000 +0300

161

-@@ -126,7 +126,7 @@

162

- 	      -o $@ dmsetup.o -ldevmapper $(LIBS)

163

-

164

- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a

165

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \

166

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \

167

- 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)

168

-

169

- all: device-mapper

170

-@@ -136,7 +136,7 @@

171

- 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic

172

-

173

- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a

174

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \

175

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \

176

- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)

177

-

178

- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o

179

180

diff --git a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch

181

deleted file mode 100644

182

index 05c7bf3..0000000

183

--- a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch

184

+++ /dev/null

185

@@ -1,37 +0,0 @@

186

-X-Gentoo-Bug: 332905

187

-X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view

188

-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905

189

-

190

-diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in

191

---- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in	2010-05-14 16:36:56.000000000 +0300

192

-+++ LVM2.2.02.72/daemons/dmeventd/Makefile.in	2010-08-17 03:00:24.000000000 +0300

193

-@@ -61,7 +61,7 @@

194

- 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic

195

-

196

- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a

197

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \

198

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L. -L$(interfacebuilddir) -o $@ \

199

- 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)

200

-

201

- ifeq ("@PKGCONFIG@", "yes")

202

-diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in

203

---- LVM2.2.02.72.orig/tools/Makefile.in	2010-06-25 21:23:10.000000000 +0300

204

-+++ LVM2.2.02.72/tools/Makefile.in	2010-08-17 03:01:07.000000000 +0300

205

-@@ -126,7 +126,7 @@

206

- 	      -o $@ dmsetup.o -ldevmapper $(LIBS)

207

-

208

- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a

209

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \

210

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \

211

- 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)

212

-

213

- all: device-mapper

214

-@@ -136,7 +136,7 @@

215

- 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic

216

-

217

- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a

218

--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \

219

-+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \

220

- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)

221

-

222

- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o

1	commit: 562ff4565b70c36e5092759881cb1fe504a342a0
2	Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3	AuthorDate: Sun Sep 3 04:45:19 2017 +0000
4	Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5	CommitDate: Sun Sep 3 04:45:19 2017 +0000
6	URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=562ff456
7
8	lvm2: bump.
9
10	Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
11
12	.../lvm2-2.02.139-dynamic-static-ldflags.patch \| 63 ++++++++++++++++++++++
13	.../lvm/2.02.28/filter-sysfs-inc-sys-stat.patch \| 11 ----
14	patches/lvm/2.02.28/no-export-dynamic.patch \| 22 --------
15	.../2.02.74/lvm2-2.02.72-no-export-dynamic.patch \| 37 -------------
16	.../2.02.88/lvm2-2.02.72-no-export-dynamic.patch \| 37 -------------
17	5 files changed, 63 insertions(+), 107 deletions(-)
18
19	diff --git a/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch
20	new file mode 100644
21	index 0000000..312e546
22	--- /dev/null
23	+++ b/patches/lvm/2.02.173/lvm2-2.02.139-dynamic-static-ldflags.patch
24	@@ -0,0 +1,63 @@
25	+diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in
26	+--- LVM2.2.02.139_O/configure.in 2016-01-19 12:54:33.155187005 +0000
27	++++ LVM2.2.02.139/configure.in 2016-01-19 12:56:39.487181372 +0000
28	+@@ -31,6 +31,7 @@
29	+ linux*)
30	+ CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
31	+ ELDFLAGS="-Wl,--export-dynamic"
32	++ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
33	+ # FIXME Generate list and use --dynamic-list=.dlopen.sym
34	+ CLDWHOLEARCHIVE="-Wl,-whole-archive"
35	+ CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
36	+@@ -2009,6 +2010,7 @@
37	+ AC_SUBST(SELINUX_PC)
38	+ AC_SUBST(SNAPSHOTS)
39	+ AC_SUBST(STATICDIR)
40	++AC_SUBST(STATIC_LDFLAGS)
41	+ AC_SUBST(STATIC_LINK)
42	+ AC_SUBST(TESTING)
43	+ AC_SUBST(TESTSUITE_DATA)
44	+diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in LVM2.2.02.139/daemons/dmeventd/Makefile.in
45	+--- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in 2016-01-19 12:54:33.278186999 +0000
46	++++ LVM2.2.02.139/daemons/dmeventd/Makefile.in 2016-01-19 12:57:44.277178484 +0000
47	+@@ -67,7 +67,7 @@
48	+ $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
49	+
50	+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
51	+- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
52	++ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
53	+ dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
54	+
55	+ ifeq ("@PKGCONFIG@", "yes")
56	+diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in
57	+--- LVM2.2.02.139_O/make.tmpl.in 2016-01-19 12:54:33.529186988 +0000
58	++++ LVM2.2.02.139/make.tmpl.in 2016-01-19 12:58:31.514176378 +0000
59	+@@ -49,6 +49,7 @@
60	+ # FIXME set this only where it's needed, not globally?
61	+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
62	+ LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@
63	++STATIC_LDFLAGS += @STATIC_LDFLAGS@
64	+ CLDFLAGS += @CLDFLAGS@
65	+ ELDFLAGS += @ELDFLAGS@
66	+ LDDEPS += @LDDEPS@
67	+diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in
68	+--- LVM2.2.02.139_O/tools/Makefile.in 2016-01-08 18:51:21.000000000 +0000
69	++++ LVM2.2.02.139/tools/Makefile.in 2016-01-19 13:00:08.349172060 +0000
70	+@@ -129,7 +129,7 @@
71	+ -o $@ dmsetup.o -ldevmapper $(LIBS)
72	+
73	+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
74	+- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
75	++ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
76	+ -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
77	+
78	+ all: device-mapper
79	+@@ -146,7 +146,7 @@
80	+ endif
81	+
82	+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
83	+- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
84	++ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
85	+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
86	+
87	+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
88
89	diff --git a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch b/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
90	deleted file mode 100644
91	index 2988e92..0000000
92	--- a/patches/lvm/2.02.28/filter-sysfs-inc-sys-stat.patch
93	+++ /dev/null
94	@@ -1,11 +0,0 @@
95	-diff -ur LVM2.2.02.28/lib/filters/filter-sysfs.c LVM2.2.02.28.new/lib/filters/filter-sysfs.c
96	---- LVM2.2.02.28/lib/filters/filter-sysfs.c 2007-08-22 16:38:16.000000000 +0200
97	-+++ LVM2.2.02.28.new/lib/filters/filter-sysfs.c 2011-01-13 20:45:38.751542669 +0100
98	-@@ -15,6 +15,7 @@
99	- #include "lib.h"
100	- #include "filter-sysfs.h"
101	- #include "lvm-string.h"
102	-+#include <sys/stat.h>
103	-
104	- #ifdef linux
105	-
106
107	diff --git a/patches/lvm/2.02.28/no-export-dynamic.patch b/patches/lvm/2.02.28/no-export-dynamic.patch
108	deleted file mode 100644
109	index 19a4e13..0000000
110	--- a/patches/lvm/2.02.28/no-export-dynamic.patch
111	+++ /dev/null
112	@@ -1,22 +0,0 @@
113	-diff -ur LVM2.2.02.28/configure LVM2.2.02.28.new/configure
114	---- LVM2.2.02.28/configure 2007-08-14 20:58:30.000000000 +0200
115	-+++ LVM2.2.02.28.new/configure 2011-01-13 20:45:08.429184861 +0100
116	-@@ -1949,7 +1949,6 @@
117	- CLDWHOLEARCHIVE="-Wl,-whole-archive"
118	- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
119	- LDDEPS="$LDDEPS .export.sym"
120	-- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
121	- LIB_SUFFIX="so"
122	- DEVMAPPER=yes
123	- ODIRECT=yes
124	-diff -ur LVM2.2.02.28/configure.in LVM2.2.02.28.new/configure.in
125	---- LVM2.2.02.28/configure.in 2007-08-14 20:58:31.000000000 +0200
126	-+++ LVM2.2.02.28.new/configure.in 2011-01-13 20:45:14.365688659 +0100
127	-@@ -38,7 +38,6 @@
128	- CLDWHOLEARCHIVE="-Wl,-whole-archive"
129	- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
130	- LDDEPS="$LDDEPS .export.sym"
131	-- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
132	- LIB_SUFFIX="so"
133	- DEVMAPPER=yes
134	- ODIRECT=yes
135
136	diff --git a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch
137	deleted file mode 100644
138	index 05c7bf3..0000000
139	--- a/patches/lvm/2.02.74/lvm2-2.02.72-no-export-dynamic.patch
140	+++ /dev/null
141	@@ -1,37 +0,0 @@
142	-X-Gentoo-Bug: 332905
143	-X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view
144	-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905
145	-
146	-diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in
147	---- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in 2010-05-14 16:36:56.000000000 +0300
148	-+++ LVM2.2.02.72/daemons/dmeventd/Makefile.in 2010-08-17 03:00:24.000000000 +0300
149	-@@ -61,7 +61,7 @@
150	- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
151	-
152	- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
153	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
154	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L. -L$(interfacebuilddir) -o $@ \
155	- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
156	-
157	- ifeq ("@PKGCONFIG@", "yes")
158	-diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in
159	---- LVM2.2.02.72.orig/tools/Makefile.in 2010-06-25 21:23:10.000000000 +0300
160	-+++ LVM2.2.02.72/tools/Makefile.in 2010-08-17 03:01:07.000000000 +0300
161	-@@ -126,7 +126,7 @@
162	- -o $@ dmsetup.o -ldevmapper $(LIBS)
163	-
164	- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
165	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
166	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \
167	- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
168	-
169	- all: device-mapper
170	-@@ -136,7 +136,7 @@
171	- $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
172	-
173	- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
174	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
175	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \
176	- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
177	-
178	- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
179
180	diff --git a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch b/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch
181	deleted file mode 100644
182	index 05c7bf3..0000000
183	--- a/patches/lvm/2.02.88/lvm2-2.02.72-no-export-dynamic.patch
184	+++ /dev/null
185	@@ -1,37 +0,0 @@
186	-X-Gentoo-Bug: 332905
187	-X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view
188	-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905
189	-
190	-diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in
191	---- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in 2010-05-14 16:36:56.000000000 +0300
192	-+++ LVM2.2.02.72/daemons/dmeventd/Makefile.in 2010-08-17 03:00:24.000000000 +0300
193	-@@ -61,7 +61,7 @@
194	- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
195	-
196	- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
197	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
198	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L. -L$(interfacebuilddir) -o $@ \
199	- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
200	-
201	- ifeq ("@PKGCONFIG@", "yes")
202	-diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in
203	---- LVM2.2.02.72.orig/tools/Makefile.in 2010-06-25 21:23:10.000000000 +0300
204	-+++ LVM2.2.02.72/tools/Makefile.in 2010-08-17 03:01:07.000000000 +0300
205	-@@ -126,7 +126,7 @@
206	- -o $@ dmsetup.o -ldevmapper $(LIBS)
207	-
208	- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
209	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
210	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) \
211	- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
212	-
213	- all: device-mapper
214	-@@ -136,7 +136,7 @@
215	- $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
216	-
217	- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
218	-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
219	-+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--no-export-dynamic -static -L$(interfacebuilddir) -o $@ \
220	- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
221	-
222	- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o

Gentoo Archives: gentoo-commits