1 |
grobian 11/11/29 18:21:19 |
2 |
|
3 |
Added: exim-4.77-as-needed-ldflags.patch |
4 |
Log: |
5 |
Fix building of helper apps respecting LDFLAGS (bug #391279) and for --as-needed. |
6 |
|
7 |
(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: exim-4.77-as-needed-ldflags.patch |
16 |
=================================================================== |
17 |
https://bugs.gentoo.org/show_bug.cgi?id=352265 |
18 |
|
19 |
Make sure LDFLAGS comes first, such that all libraries are considered, |
20 |
and not discarded when --as-needed is in effect. |
21 |
|
22 |
https://bugs.gentoo.org/show_bug.cgi?id=391279 |
23 |
|
24 |
Use LDFLAGS for all targets, not just the exim binary, such that |
25 |
--as-needed works as well. |
26 |
|
27 |
|
28 |
--- OS/Makefile-Base |
29 |
+++ OS/Makefile-Base |
30 |
@@ -327,12 +327,12 @@ |
31 |
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c |
32 |
rm -f exim |
33 |
@echo "$(LNCC) -o exim" |
34 |
- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \ |
35 |
+ $(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \ |
36 |
routers/routers.a transports/transports.a lookups/lookups.a \ |
37 |
auths/auths.a pdkim/pdkim.a \ |
38 |
$(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \ |
39 |
$(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \ |
40 |
- $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS) |
41 |
+ $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS) |
42 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
43 |
echo $(STRIP_COMMAND) exim; \ |
44 |
$(STRIP_COMMAND) exim; \ |
45 |
@@ -340,8 +340,8 @@ |
46 |
|
47 |
exim_dumpdb: $(OBJ_DUMPDB) |
48 |
@echo "$(LNCC) -o exim_dumpdb" |
49 |
- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \ |
50 |
- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
51 |
+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LDFLAGS) $(OBJ_DUMPDB) \ |
52 |
+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
53 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
54 |
echo $(STRIP_COMMAND) exim_dumpdb; \ |
55 |
$(STRIP_COMMAND) exim_dumpdb; \ |
56 |
@@ -355,8 +355,8 @@ |
57 |
|
58 |
exim_fixdb: $(OBJ_FIXDB) auths/auths.a |
59 |
@echo "$(LNCC) -o exim_fixdb" |
60 |
- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \ |
61 |
- auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) |
62 |
+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LDFLAGS) $(OBJ_FIXDB) \ |
63 |
+ auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
64 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
65 |
echo $(STRIP_COMMAND) exim_fixdb; \ |
66 |
$(STRIP_COMMAND) exim_fixdb; \ |
67 |
@@ -370,8 +370,8 @@ |
68 |
|
69 |
exim_tidydb: $(OBJ_TIDYDB) |
70 |
@echo "$(LNCC) -o exim_tidydb" |
71 |
- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \ |
72 |
- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
73 |
+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LDFLAGS) $(OBJ_TIDYDB) \ |
74 |
+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
75 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
76 |
echo $(STRIP_COMMAND) exim_tidydb; \ |
77 |
$(STRIP_COMMAND) exim_tidydb; \ |
78 |
@@ -383,8 +383,8 @@ |
79 |
|
80 |
exim_dbmbuild: exim_dbmbuild.o |
81 |
@echo "$(LNCC) -o exim_dbmbuild" |
82 |
- $(FE)$(LNCC) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \ |
83 |
- $(LIBS) $(EXTRALIBS) $(DBMLIB) |
84 |
+ $(FE)$(LNCC) -o exim_dbmbuild $(LDFLAGS) exim_dbmbuild.o \ |
85 |
+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS) |
86 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
87 |
echo $(STRIP_COMMAND) exim_dbmbuild; \ |
88 |
$(STRIP_COMMAND) exim_dbmbuild; \ |
89 |
@@ -398,8 +398,8 @@ |
90 |
@echo "$(CC) exim_lock.c" |
91 |
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c |
92 |
@echo "$(LNCC) -o exim_lock" |
93 |
- $(FE)$(LNCC) -o exim_lock $(LFLAGS) exim_lock.o \ |
94 |
- $(LIBS) $(EXTRALIBS) |
95 |
+ $(FE)$(LNCC) -o exim_lock $(LDFLAGS) exim_lock.o \ |
96 |
+ $(LIBS) $(EXTRALIBS) $(LFLAGS) |
97 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
98 |
echo $(STRIP_COMMAND) exim_lock; \ |
99 |
$(STRIP_COMMAND) exim_lock; \ |
100 |
@@ -429,9 +429,9 @@ |
101 |
$(FE)$(CC) -o em_version.o -c \ |
102 |
$(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c |
103 |
@echo "$(LNCC) -o eximon.bin" |
104 |
- $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \ |
105 |
+ $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LDFLAGS) $(XLFLAGS) \ |
106 |
$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 $(PCRE_LIBS) \ |
107 |
- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc |
108 |
+ $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc $(LFLAGS) |
109 |
@if [ x"$(STRIP_COMMAND)" != x"" ]; then \ |
110 |
echo $(STRIP_COMMAND) eximon.bin; \ |
111 |
$(STRIP_COMMAND) eximon.bin; \ |
112 |
@@ -706,9 +706,9 @@ |
113 |
test_dbfn: config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \ |
114 |
string.o tod.o version.o |
115 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c |
116 |
- $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \ |
117 |
+ $(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \ |
118 |
dummies.o sa-globals.o sa-os.o store.o string.o \ |
119 |
- tod.o version.o $(LIBS) $(DBMLIB) |
120 |
+ tod.o version.o $(LIBS) $(DBMLIB) $(LFLAGS) |
121 |
rm -f dbfn.o |
122 |
|
123 |
test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \ |
124 |
@@ -717,28 +717,28 @@ |
125 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c |
126 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c |
127 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c |
128 |
- $(LNCC) -o test_host $(LFLAGS) \ |
129 |
+ $(LNCC) -o test_host $(LDFLAGS) \ |
130 |
host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \ |
131 |
- tod.o tree.o $(LIBS) $(LIBRESOLV) |
132 |
+ tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS) |
133 |
rm -f child.o dummies.o host.o dns.o |
134 |
|
135 |
test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o |
136 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c |
137 |
- $(LNCC) -o test_os $(LFLAGS) os.o dummies.o \ |
138 |
- sa-globals.o store.o string.o tod.o $(LIBS) |
139 |
+ $(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \ |
140 |
+ sa-globals.o store.o string.o tod.o $(LIBS) $(LFLAGS) |
141 |
rm -f os.o |
142 |
|
143 |
test_parse: config.h parse.c dummies.o sa-globals.o \ |
144 |
store.o string.o tod.o version.o |
145 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c |
146 |
- $(LNCC) -o test_parse $(LFLAGS) parse.o \ |
147 |
- dummies.o sa-globals.o store.o string.o tod.o version.o |
148 |
+ $(LNCC) -o test_parse $(LDFLAGS) parse.o \ |
149 |
+ dummies.o sa-globals.o store.o string.o tod.o version.o $(LFLAGS) |
150 |
rm -f parse.o |
151 |
|
152 |
test_string: config.h string.c dummies.o sa-globals.o store.o tod.o |
153 |
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c |
154 |
- $(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \ |
155 |
- dummies.o sa-globals.o store.o tod.o $(LIBS) |
156 |
+ $(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \ |
157 |
+ dummies.o sa-globals.o store.o tod.o $(LIBS) $(LFLAGS) |
158 |
rm -f string.o |
159 |
|
160 |
# End |