mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-06 03:10:01 +00:00
Code Issues Projects Releases Wiki Activity

boinc: Upgrade to 7.12

Browse Source 
* Fixes build wth OpenSSL 1.1.x
* Drop cross compile patch, not needed anymore
* Package systemd support
* Drop no-pie flags, works ok with PIE now
* autotools-brokensep is no longer needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-09-05 16:37:22 -07:00
parent 0eab9697b3
commit 467fe56ba4
2 changed files with 16 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
-98
View File
@@ -1,98 +0,0 @@
Remove rpath, its bad for cross compiling to encode
build time rpaths
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: boinc-client_release-7.6-7.6.33/api/Makefile.am
===================================================================
--- boinc-client_release-7.6-7.6.33.orig/api/Makefile.am
+++ boinc-client_release-7.6-7.6.33/api/Makefile.am
@@ -43,18 +43,18 @@ endif
lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
-libboinc_api_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_api_la_LDFLAGS = -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 = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION) -ljpeg
+libboinc_graphics2_la_LDFLAGS = -version-number $(LIBBOINC_VERSION) -ljpeg
endif #BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_opencl.la
libboinc_opencl_la_SOURCES = $(opencl_files)
-libboinc_opencl_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_opencl_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
if INSTALL_HEADERS
## install only headers that are meant for exporting the API !!
Index: boinc-client_release-7.6-7.6.33/lib/Makefile.am
===================================================================
--- boinc-client_release-7.6-7.6.33.orig/lib/Makefile.am
+++ boinc-client_release-7.6-7.6.33/lib/Makefile.am
@@ -173,7 +173,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 = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
+libboinc_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
libboinc_la_LIBADD =
if ENABLE_BOINCCRYPT
@@ -181,7 +181,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 = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
+libboinc_crypt_la_LDFLAGS = -static -version-number $(LIBBOINC_VERSION)
libboinc_crypt_la_LIBADD =
endif
@@ -190,7 +190,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la
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_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_fcgi_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_fcgi_la_LIBADD =
endif
# end of "if ENABLE_FCGI"
Index: boinc-client_release-7.6-7.6.33/sched/Makefile.am
===================================================================
--- boinc-client_release-7.6-7.6.33.orig/sched/Makefile.am
+++ boinc-client_release-7.6-7.6.33/sched/Makefile.am
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libsched.la
libsched_la_SOURCES = $(libsched_sources)
libsched_la_CFLAGS = $(AM_CPPFLAGS)
libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
-libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libsched_la_LDFLAGS= -version-number $(LIBBOINC_VERSION)
libsched_la_LIBADD= $(SSL_LIBS)
## install only headers that are meant for exporting the API !!
@@ -48,7 +48,7 @@ lib_LTLIBRARIES += libsched_fcgi.la
libsched_fcgi_la_SOURCES = $(libsched_sources)
libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libsched_fcgi_la_LDFLAGS= -version-number $(LIBBOINC_VERSION)
libsched_fcgi_la_LIBADD=
endif
Index: boinc-client_release-7.6-7.6.33/zip/Makefile.am
===================================================================
--- boinc-client_release-7.6-7.6.33.orig/zip/Makefile.am
+++ boinc-client_release-7.6-7.6.33/zip/Makefile.am
@@ -61,7 +61,7 @@ endif
lib_LTLIBRARIES = libboinc_zip.la
libboinc_zip_la_SOURCES = $(libboinc_zip_sources)
-libboinc_zip_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_zip_la_LDFLAGS = -version-number $(LIBBOINC_VERSION)
libboinc_zip_la_LIBADD =
# Some OSs may not prefix libraries with lib.
meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb → meta-oe/recipes-extended/boinc/boinc-client_7.12.bb
+16 -8
View File
@@ -29,21 +29,19 @@ DEPENDS = "curl \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
nettle \
"
SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \
SRCREV = "bd12338dbd29083daa5a4b022592ca31ff68cd98"
BRANCH = "client_release/7/${PV}"
SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
file://boinc-AM_CONDITIONAL.patch \
file://opengl_m4_check.patch \
file://cross-compile.patch \
file://gtk-configure.patch \
"
SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac"
SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d"
inherit gettext autotools-brokensep pkgconfig distro_features_check
inherit gettext autotools pkgconfig distro_features_check systemd
REQUIRED_DISTRO_FEATURES += "opengl"
S = "${WORKDIR}/${BPN}_release-7.6-${PV}"
S = "${WORKDIR}/git"
EXTRA_OECONF += "\
--enable-libraries \
@@ -75,5 +73,15 @@ do_compile_prepend () {
sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/${TARGET_SYS}-libtool
sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool
}
do_install_append() {
if [ -e ${D}${libdir}/systemd/system/boinc-client.service ]; then
install -D -m 0644 \
${D}${libdir}/systemd/system/boinc-client.service \
${D}${systemd_system_unitdir}/boinc-client.service
rm -rf ${D}${libdir}/systemd
fi
}
SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
SYSTEMD_SERVICE_${PN} = "boinc-client.service"
FILES_${PN} += "${libdir}/systemd"