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
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
Index: boinc/lib/Makefile.am
===================================================================
--- boinc.orig/lib/Makefile.am
+++ boinc/lib/Makefile.am
@@ -184,6 +184,10 @@ pkgconfig_DATA = libboinc.pc
libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+libboinc_la_AR = gcc-ar
+libboinc_la_RANLIB = gcc-ranlib
+libboinc_a_AR = gcc-ar
+libboinc_a_RANLIB = gcc-ranlib
libboinc_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
if OS_FREEBSD
libboinc_la_LDFLAGS += -lexecinfo
@@ -196,6 +200,10 @@ pkgconfig_DATA += libboinc_crypt.pc
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
+libboinc_crypt_la_AR = gcc-ar
+libboinc_crypt_la_RANLIB = gcc-ranlib
+libboinc_crypt_a_AR = gcc-ar
+libboinc_crypt_a_RANLIB = gcc-ranlib
libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) $(SSL_LIBS) $(RSA_LIBS)
libboinc_crypt_la_LIBADD = $(LIBBOINC)
endif
@@ -206,6 +214,10 @@ pkgconfig_DATA += libboinc_fcgi.pc
libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources) $(win_sources)
libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+libboinc_fcgi_la_AR = gcc-ar
+libboinc_fcgi_la_RANLIB = gcc-ranlib
+libboinc_fcgi_a_AR = gcc-ar
+libboinc_fcgi_a_RANLIB = gcc-ranlib
libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_fcgi_la_LIBADD =
endif
@@ -269,7 +281,7 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
msg_test_LDADD = $(LIBBOINC)
crypt_prog_SOURCES = crypt_prog.cpp
crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
-crypt_prog_LDADD = $(LIBBOINC_CRYPT_STATIC) $(LIBBOINC) $(SSL_LIBS)
+crypt_prog_LDADD = $(LIBBOINC_CRYPT) $(LIBBOINC) $(SSL_LIBS)
parse_test_SOURCES = parse_test.cpp
parse_test_CXXFLAGS = $(PTHREAD_CFLAGS)
parse_test_LDADD = $(LIBBOINC)
Index: boinc/samples/condor/Makefile
===================================================================
--- boinc.orig/samples/condor/Makefile
+++ boinc/samples/condor/Makefile
@@ -58,6 +58,8 @@ ifdef BUILD_WITH_MINGW
CURL_EXTRA_LDFLAGS += -liphlpapi
endif
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = boinc_gahp
all: $(PROGS)
Index: boinc/samples/multi_thread/Makefile
===================================================================
--- boinc.orig/samples/multi_thread/Makefile
+++ boinc/samples/multi_thread/Makefile
@@ -54,6 +54,8 @@ CXXFLAGS += -g \
-L$(BOINC_LIB_DIR) \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
PROG = multi_thread$(MULTITHREAD_RELEASE_SUFFIX)
all: $(PROG)
Index: boinc/samples/sleeper/Makefile
===================================================================
--- boinc.orig/samples/sleeper/Makefile
+++ boinc/samples/sleeper/Makefile
@@ -45,6 +45,8 @@ CXXFLAGS += -g \
-L$(BOINC_LIB_DIR) \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = sleeper
all: $(PROGS)
Index: boinc/samples/vboxmonitor/Makefile
===================================================================
--- boinc.orig/samples/vboxmonitor/Makefile
+++ boinc/samples/vboxmonitor/Makefile
@@ -46,6 +46,8 @@ CXXFLAGS += -g \
-L$(BOINC_LIB_DIR) \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = vboxmonitor
all: $(PROGS)
Index: boinc/samples/vboxwrapper/Makefile
===================================================================
--- boinc.orig/samples/vboxwrapper/Makefile
+++ boinc/samples/vboxwrapper/Makefile
@@ -56,6 +56,8 @@ CXXFLAGS += -g \
-L$(BOINC_LIB_DIR) \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = vboxwrapper$(VBOXWRAPPER_RELEASE_SUFFIX)
HEADERS = vbox_common.h vboxjob.h vbox_vboxmanage.h vboxwrapper.h
Index: boinc/samples/worker/Makefile
===================================================================
--- boinc.orig/samples/worker/Makefile
+++ boinc/samples/worker/Makefile
@@ -21,7 +21,7 @@ distclean:
rm -f $(PROGS) $(addsuffix .exe, $(PROGS)) *.o
worker$(WORKER_RELEASE_SUFFIX): worker.cpp
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o worker$(WORKER_RELEASE_SUFFIX) worker.cpp
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -static -o worker$(WORKER_RELEASE_SUFFIX) worker.cpp
install: all
Index: boinc/samples/wrapper/Makefile
===================================================================
--- boinc.orig/samples/wrapper/Makefile
+++ boinc/samples/wrapper/Makefile
@@ -68,6 +68,8 @@ ifdef BUILD_APPS_WITH_VCPKG
-L$(VCPKG_DIR)/lib
endif
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = wrapper$(WRAPPER_RELEASE_SUFFIX)
all: $(PROGS)
Index: boinc/samples/wrappture/Makefile
===================================================================
--- boinc.orig/samples/wrappture/Makefile
+++ boinc/samples/wrappture/Makefile
@@ -50,6 +50,8 @@ CXXFLAGS += -g \
-L$(VCPKG_DIR)/lib \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
PROGS = wrappture_example fermi
all: $(PROGS)
Index: boinc/samples/example_app/Makefile
===================================================================
--- boinc.orig/samples/example_app/Makefile
+++ boinc/samples/example_app/Makefile
@@ -53,6 +53,8 @@ CXXFLAGS += -g \
-L/usr/X11R6/lib \
-L.
+LDFLAGS := -static $(LDFLAGS)
+
# to get the graphics app to compile you may need to install some packages
# e.g. ftgl-devel.x86_64
#
@@ -136,7 +138,7 @@ uc2_graphics: uc2_graphics.o ttfont.o $(
$(LIBFTGL) $(LIBGL) $(LIBUI) -lm
slide_show: slide_show.o $(MAKEFILE_STDLIB) $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_graphics2.a
- $(CXX) $(CXXFLAGS) -o slide_show slide_show.o $(MAKEFILE_LDFLAGS) \
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o slide_show slide_show.o $(MAKEFILE_LDFLAGS) \
$(BOINC_API_DIR)/libboinc_graphics2.a \
$(BOINC_API_DIR)/libboinc_api.a \
$(BOINC_LIB_DIR)/libboinc.a \
Index: boinc/api/Makefile.am
===================================================================
--- boinc.orig/api/Makefile.am
+++ boinc/api/Makefile.am
@@ -46,6 +46,10 @@ pkgconfig_DATA = libboinc_api.pc
libboinc_api_la_SOURCES = $(api_files)
libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -lpthread
libboinc_api_la_LIBADD = -L../lib/.libs $(LIBBOINC)
+libboinc_api_la_AR = gcc-ar
+libboinc_api_la_RANLIB = gcc-ranlib
+libboinc_api_a_AR = gcc-ar
+libboinc_api_a_RANLIB = gcc-ranlib
if BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_graphics2.la
@@ -54,6 +58,10 @@ libboinc_graphics2_la_SOURCES = $(graphi
libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/samples/image_libs
libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
libboinc_graphics2_la_LIBADD = -L../lib/.libs $(APPLIBS)
+libboinc_graphics2_la_AR = gcc-ar
+libboinc_graphics2_la_RANLIB = gcc-ranlib
+libboinc_graphics2_a_AR = gcc-ar
+libboinc_graphics2_a_RANLIB = gcc-ranlib
endif #BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_opencl.la
Index: boinc/zip/Makefile.am
===================================================================
--- boinc.orig/zip/Makefile.am
+++ boinc/zip/Makefile.am
@@ -33,6 +33,10 @@ libboinc_zip_la_CFLAGS = $(AM_CFLAGS) $(
libboinc_zip_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(LIBZIP_CFLAGS)
libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) $(LIBZIP_LIBS)
libboinc_zip_la_LIBADD = $(LIBBOINC)
+libboinc_zip_la_AR = gcc-ar
+libboinc_zip_la_RANLIB = gcc-ranlib
+libboinc_zip_a_AR = gcc-ar
+libboinc_zip_a_RANLIB = gcc-ranlib
# Some OSs may not prefix libraries with lib.
# For example OS2
Index: boinc/configure.ac
===================================================================
--- boinc.orig/configure.ac
+++ boinc/configure.ac
@@ -94,6 +94,12 @@ AM_PROG_CC_C_O
PKG_PROG_PKG_CONFIG
PKG_INSTALLDIR
+dnl ------
+dnl essential for LTO and static applications in apps and samples
+AC_PROG_RANLIB
+AM_PROG_AR
+dnl ------
+
m4_divert_once([HELP_ENABLE],
AS_HELP_STRING([BOINC Default enable values], [--enable-server --enable-client --enable-libraries --enable-manager: builds server, client, and libraries]))
Index: boinc/samples/openclapp/Makefile
===================================================================
--- boinc.orig/samples/openclapp/Makefile
+++ boinc/samples/openclapp/Makefile
@@ -62,11 +62,11 @@ distclean:
install: all
openclapp: openclapp.o boinc_opencl.o libstdc++.a
- $(CXX) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
- libstdc++.a -lOpenCL -lboinc_api -lboinc -lpthread
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o openclapp openclapp.o boinc_opencl.o \
+ libstdc++.a -lOpenCL $(BOINC_API_DIR)/libboinc_api.a $(BOINC_LIB_DIR)/libboinc.a -lpthread
openclapp.o: openclapp.cpp openclapp.hpp
- $(CXX) $(CXXFLAGS) -c openclapp.cpp
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c openclapp.cpp
boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
- $(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp
|
