1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
commit 222e97c23dd015a8fc4bcceb598720cc17337edf
Author: Andrew Price <anprice@redhat.com>
Date: Mon Feb 4 14:54:34 2019 +0000
Fix libuuid linking
Fixes a build failure in Rawhide.
Signed-off-by: Andrew Price <anprice@redhat.com>
diff --git a/gfs2/libgfs2/Makefile.am b/gfs2/libgfs2/Makefile.am
index 749da85a..76df920e 100644
--- a/gfs2/libgfs2/Makefile.am
+++ b/gfs2/libgfs2/Makefile.am
@@ -54,8 +54,9 @@ libgfs2_la_CPPFLAGS = \
$(uuid_CFLAGS)
gfs2l_SOURCES = gfs2l.c
-gfs2l_LDADD = libgfs2.la
-gfs2l_LDFLAGS = $(uuid_LIBS)
+gfs2l_LDADD = \
+ libgfs2.la \
+ $(uuid_LIBS)
gfs2l_CPPFLAGS = \
-I$(top_srcdir)/gfs2/include \
-D_FILE_OFFSET_BITS=64
commit 1a92a964c8ba87d95b2f43b0adc3d351a7f7ba80
Author: Andrew Price <anprice@redhat.com>
Date: Mon Feb 4 15:31:33 2019 +0000
Fix more linking errors
Signed-off-by: Andrew Price <anprice@redhat.com>
diff --git a/gfs2/convert/Makefile.am b/gfs2/convert/Makefile.am
index 4db643fb..2d61af74 100644
--- a/gfs2/convert/Makefile.am
+++ b/gfs2/convert/Makefile.am
@@ -7,5 +7,6 @@ gfs2_convert_CPPFLAGS = \
-I$(top_srcdir)/gfs2/include \
-I$(top_srcdir)/gfs2/libgfs2
-gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_convert_LDFLAGS = $(uuid_LIBS)
+gfs2_convert_LDADD = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
+ $(uuid_LIBS)
diff --git a/gfs2/edit/Makefile.am b/gfs2/edit/Makefile.am
index a9b177e9..4a89502c 100644
--- a/gfs2/edit/Makefile.am
+++ b/gfs2/edit/Makefile.am
@@ -25,9 +25,9 @@ gfs2_edit_CFLAGS = \
$(zlib_CFLAGS) \
$(uuid_CFLAGS)
-gfs2_edit_LDFLAGS = \
+gfs2_edit_LDADD = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
$(ncurses_LIBS) \
$(zlib_LIBS) \
$(uuid_LIBS)
-gfs2_edit_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
index 97fcd404..1c528051 100644
--- a/gfs2/fsck/Makefile.am
+++ b/gfs2/fsck/Makefile.am
@@ -36,6 +36,5 @@ fsck_gfs2_CPPFLAGS = \
-I$(top_srcdir)/gfs2/libgfs2
fsck_gfs2_LDADD = \
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
-fsck_gfs2_LDFLAGS = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
$(uuid_LIBS)
diff --git a/gfs2/glocktop/Makefile.am b/gfs2/glocktop/Makefile.am
index 1102c8e2..f5076554 100644
--- a/gfs2/glocktop/Makefile.am
+++ b/gfs2/glocktop/Makefile.am
@@ -9,10 +9,6 @@ glocktop_SOURCES = \
glocktop_CFLAGS = \
$(ncurses_CFLAGS)
-glocktop_LDFLAGS = \
- $(ncurses_LIBS) \
- $(uuid_LIBS)
-
glocktop_CPPFLAGS = \
-D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE \
@@ -21,4 +17,6 @@ glocktop_CPPFLAGS = \
-I$(top_srcdir)/gfs2/libgfs2
glocktop_LDADD = \
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
+ $(ncurses_LIBS) \
+ $(uuid_LIBS)
diff --git a/gfs2/mkfs/Makefile.am b/gfs2/mkfs/Makefile.am
index f0dd961c..fd7145b8 100644
--- a/gfs2/mkfs/Makefile.am
+++ b/gfs2/mkfs/Makefile.am
@@ -25,10 +25,10 @@ mkfs_gfs2_CPPFLAGS = $(COMMON_CPPFLAGS)
mkfs_gfs2_CFLAGS = \
$(blkid_CFLAGS) \
$(uuid_CFLAGS)
-mkfs_gfs2_LDFLAGS = \
+mkfs_gfs2_LDADD = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
$(blkid_LIBS) \
$(uuid_LIBS)
-mkfs_gfs2_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
gfs2_grow_SOURCES = \
main_grow.c \
@@ -36,16 +36,17 @@ gfs2_grow_SOURCES = \
gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
gfs2_grow_CFLAGS = $(blkid_CFLAGS)
-gfs2_grow_LDFLAGS = \
+gfs2_grow_LDADD = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
$(blkid_LIBS) \
$(uuid_LIBS)
-gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
gfs2_jadd_SOURCES = \
main_jadd.c \
metafs.c
gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS)
-gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_jadd_LDFLAGS = $(uuid_LIBS)
+gfs2_jadd_LDADD = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
+ $(uuid_LIBS)
diff --git a/gfs2/tune/Makefile.am b/gfs2/tune/Makefile.am
index 7628f424..171377d0 100644
--- a/gfs2/tune/Makefile.am
+++ b/gfs2/tune/Makefile.am
@@ -13,5 +13,5 @@ tunegfs2_CPPFLAGS = \
-I$(top_srcdir)/group/include
tunegfs2_CFLAGS = \
$(uuid_CFLAGS)
-tunegfs2_LDFLAGS = \
+tunegfs2_LDADD = \
$(uuid_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 40fcfb47..40b486b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,8 +26,7 @@ nukerg_CFLAGS = \
-I$(top_srcdir)/gfs2/libgfs2 \
-I$(top_srcdir)/gfs2/include
nukerg_LDADD = \
- $(top_builddir)/gfs2/libgfs2/libgfs2.la
-nukerg_LDFLAGS = \
+ $(top_builddir)/gfs2/libgfs2/libgfs2.la \
$(uuid_LIBS)
if HAVE_CHECK
@@ -54,16 +53,18 @@ check_meta_SOURCES = \
$(UNIT_SOURCES) \
check_meta.c
check_meta_CFLAGS = $(UNIT_CFLAGS)
-check_meta_LDADD = $(UNIT_LDADD)
-check_meta_LDFLAGS = $(uuid_LIBS)
+check_meta_LDADD = \
+ $(UNIT_LDADD) \
+ $(uuid_LIBS)
check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
check_rgrp_SOURCES = \
$(UNIT_SOURCES) \
check_rgrp.c
check_rgrp_CFLAGS = $(UNIT_CFLAGS)
-check_rgrp_LDADD = $(UNIT_LDADD)
-check_rgrp_LDFLAGS = $(uuid_LIBS)
+check_rgrp_LDADD = \
+ $(UNIT_LDADD) \
+ $(uuid_LIBS)
check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
endif
|
