jengelh/boinc-client
SHA256
1
0
Fork 0
forked from pool/boinc-client
Code Pull Requests Activity
79848c973d
boinc-client/libboinc-shared.patch

137 lines
4.9 KiB
Diff
Raw Normal View History

Accepting request 626119 from home:aaronpuchert - Update to version 7.12.1. - Remove doc package, since the files have been removed from the source. Actually it wasn't even the documentation, but the server code. - Disable idle detection via the XSS API and remove dependency to libXScrnSaver-devel. This feature requires access to a running X server, which the BOINC client does not have in OpenSUSE. - Rename the devel package and provide the correct dependency. The devel package provides the headers for libboinc, and has nothing to do with the BOINC client. - Add conflict to original devel package. - Remove unnecessary dependency to libxslt. - Update systemd service file with changes from upstream: start after network-online.target, and use "ProtectHome=true". - Move bash completion file to /usr/share tree to fix rpmlint. - Declare license files as %license. - Don't install `notes` and `todo` - these are internal notes of the developers and not helpful to users. - Drop 0001-MGR-support-wxWidgets-without-webview.patch, which has landed upstream (commit 27bb3c9e). - libboinc-shared.patch: Build shared libraries for client and static libraries for science apps. Science apps are distributed as binaries over the BOINC network, so dynamic linking doesn't make sense. But we can use dynamic linking for the client. - build-client-scripts.patch: Add some targets to fix build. - Fix default path for boincscr. OBS-URL: https://build.opensuse.org/request/show/626119 OBS-URL: https://build.opensuse.org/package/show/network/boinc-client?expand=0&rev=72
2018-08-06 15:31:58 +02:00
Build shared libraries for client and static libraries for science apps.
diff --git a/api/Makefile.am b/api/Makefile.am
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -43,18 +43,18 @@ endif
lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
-libboinc_api_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+libboinc_api_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
if BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_graphics2.la
libboinc_graphics2_la_SOURCES = $(graphics2_files)
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_LDFLAGS = -static -version-number $(LIBBOINC_VERSION) -ljpeg
endif #BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_opencl.la
libboinc_opencl_la_SOURCES = $(opencl_files)
-libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
+libboinc_opencl_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
if INSTALL_HEADERS
## install only headers that are meant for exporting the API !!
diff --git a/apps/Makefile.am b/apps/Makefile.am
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -8,15 +8,15 @@ example_PROGRAMS = upper_case concat 1sec
upper_case_SOURCES = upper_case.cpp
upper_case_CXXFLAGS = $(PTHREAD_CFLAGS)
-upper_case_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
+upper_case_LDFLAGS = $(PTHREAD_CFLAGS)
upper_case_LDADD = $(APPLIBS)
concat_SOURCES = concat.cpp
concat_CXXFLAGS = $(PTHREAD_CFLAGS)
-concat_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
+concat_LDFLAGS = $(PTHREAD_CFLAGS)
concat_LDADD = $(APPLIBS)
1sec_SOURCES = 1sec.cpp
1sec_CXXFLAGS = $(PTHREAD_CFLAGS)
-1sec_LDFLAGS = -static-libtool-libs $(PTHREAD_CFLAGS)
+1sec_LDFLAGS = $(PTHREAD_CFLAGS)
1sec_LDADD = $(APPLIBS)
diff --git a/client/Makefile.am b/client/Makefile.am
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,7 +4,6 @@
include $(top_srcdir)/Makefile.incl
if ENABLE_CLIENT_RELEASE
- AM_LDFLAGS += -static-libtool-libs
## for an entirely statically linked library, you may want to try
## -all-static instead. There's a good chance it won't work properly,
## so we'll use the safer "-static-libtool-libs" by default.
diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am
--- a/clientgui/Makefile.am
+++ b/clientgui/Makefile.am
@@ -7,7 +7,6 @@
include $(top_srcdir)/Makefile.incl
if ENABLE_CLIENT_RELEASE
- AM_LDFLAGS += -static-libtool-libs
## for an entirely statically linked library, you may want to try
## -all-static instead. There's a good chance it won't work properly,
## so we'll use the safer "-static-libtool-libs" by default.
diff --git a/clientscr/Makefile.am b/clientscr/Makefile.am
--- a/clientscr/Makefile.am
+++ b/clientscr/Makefile.am
@@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.incl
AM_LDFLAGS += -lpthread
if ENABLE_CLIENT_RELEASE
- AM_LDFLAGS += -static-libtool-libs
## for an entirely statically linked library, you may want to try
## -all-static instead. There's a good chance it won't work properly,
## so we'll use the safer "-static-libtool-libs" by default.
diff --git a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -182,7 +182,7 @@ lib_LTLIBRARIES = libboinc.la
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_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+libboinc_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
if ENABLE_BOINCCRYPT
@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_crypt.la
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_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
+libboinc_crypt_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_crypt_la_LIBADD =
endif
diff --git a/sched/Makefile.am b/sched/Makefile.am
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -4,7 +4,6 @@
include $(top_srcdir)/Makefile.incl
AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
-AM_LDFLAGS += -static
if ENABLE_LIBRARIES
diff --git a/tools/Makefile.am b/tools/Makefile.am
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -43,7 +43,6 @@ dist_tools_DATA = \
project.xml
AM_CXXFLAGS += $(MYSQL_CFLAGS)
-AM_LDFLAGS += -static
cancel_jobs_SOURCES = cancel_jobs.cpp
cancel_jobs_LDADD = $(SERVERLIBS)
diff --git a/vda/Makefile.am b/vda/Makefile.am
--- a/vda/Makefile.am
+++ b/vda/Makefile.am
@@ -4,7 +4,6 @@ vdadir=$(prefix)/lib/boinc-server-maker/vda
vda_PROGRAMS = vda vdad ssim
AM_CXXFLAGS += $(MYSQL_CFLAGS)
-AM_LDFLAGS += -static
vda_SOURCES = vda.cpp vda_lib.cpp vda_lib2.cpp vda_policy.cpp stats.cpp
vda_LDADD = $(SERVERLIBS)
Copy Permalink