Drop upstreamed patch Signed-off-by: Khem Raj <[email protected]> --- .../boinc/boinc-client/opengl_m4_check.patch | 28 ------------------- ...client_7.16.bb => boinc-client_7.16.16.bb} | 5 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch rename meta-oe/recipes-extended/boinc/{boinc-client_7.16.bb => boinc-client_7.16.16.bb} (96%)
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 @@ -From 4f2dd929618f149087249f3c90cc056d5080b1e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Thu, 3 Nov 2016 01:20:33 -0700 -Subject: [PATCH] boinc: Add recipe for boinc-client - -Do not add prefix/lib to library search path -let sysroot take care of that - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Inappropriate[Cross-compile specific] - ---- - m4/ax_check_gl.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 -index e26ce5b930..1e60c9266a 100644 ---- a/m4/ax_check_gl.m4 -+++ b/m4/ax_check_gl.m4 -@@ -58,7 +58,7 @@ else - else - ax_try_lib="${ax_lib}" - fi -- LIBS="-L${prefix}/lib ${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" -+ LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[ - # 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 similarity index 96% rename from meta-oe/recipes-extended/boinc/boinc-client_7.16.bb rename to 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 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ nettle \ " -SRCREV = "e0e033af9fca3cca84a3417ea6531ae25be73a7a" -BRANCH = "client_release/7/${PV}" +SRCREV = "df0239e6f074207798a8ecf1358a74545dda9132" +BRANCH = "client_release/7/7.16" SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://boinc-AM_CONDITIONAL.patch \ - file://opengl_m4_check.patch \ file://gtk-configure.patch \ " -- 2.30.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#89292): https://lists.openembedded.org/g/openembedded-devel/message/89292 Mute This Topic: https://lists.openembedded.org/mt/80393963/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
