summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-02-04 14:23:37 -0800
committerKhem Raj <raj.khem@gmail.com>2021-02-04 15:29:01 -0800
commit3cf7962581d7d3404762f98e20b5a2c404152dc1 (patch)
treecb47f6d5e798b85d116fca1a92b4c61e0f73b582
parent470fbe378cc68f4fd7a47a2c54fd4bb081bb0aa7 (diff)
downloadmeta-openembedded-3cf7962581d7d3404762f98e20b5a2c404152dc1.tar.gz
boinc-client: Upgrade to 7.16.16 release
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch28
-rw-r--r--meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb (renamed from meta-oe/recipes-extended/boinc/boinc-client_7.16.bb)5
2 files changed, 2 insertions, 31 deletions
diff --git a/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
deleted file mode 100644
index ad4493f0b6..0000000000
--- a/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 3 Nov 2016 01:20:33 -0700
4Subject: [PATCH] boinc: Add recipe for boinc-client
5
6Do not add prefix/lib to library search path
7let sysroot take care of that
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Inappropriate[Cross-compile specific]
11
12---
13 m4/ax_check_gl.m4 | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4
17index e26ce5b930..1e60c9266a 100644
18--- a/m4/ax_check_gl.m4
19+++ b/m4/ax_check_gl.m4
20@@ -58,7 +58,7 @@ else
21 else
22 ax_try_lib="${ax_lib}"
23 fi
24- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
25+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
26 AC_LINK_IFELSE(
27 [AC_LANG_PROGRAM([[
28 # if HAVE_WINDOWS_H && defined(_WIN32)
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
index db90f06f46..441bcd3ac3 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb
@@ -29,11 +29,10 @@ DEPENDS = "curl \
29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
30 nettle \ 30 nettle \
31" 31"
32SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" 32SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132"
33BRANCH = "client_release/7/${PV}" 33BRANCH = "client_release/7/7.16"
34SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ 34SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \
35 file://boinc-AM_CONDITIONAL.patch \ 35 file://boinc-AM_CONDITIONAL.patch \
36 file://opengl_m4_check.patch \
37 file://gtk-configure.patch \ 36 file://gtk-configure.patch \
38" 37"
39 38