boinc: Add recipe for boinc-client
PATCH 1/16 boinc: Add recipe for boinc-client
--- .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 19 +++++ .../boinc/boinc-client/cross-compile.patch | 92 ++++++++++++++++++++++ .../boinc/boinc-client/opengl_m4_check.patch | 13 +++ .../recipes-extended/boinc/boinc-client_7.6.33.bb | 60 ++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch new file +19 -0
@@ -0,0 +1,19 @@ +--- A/configure.ac ++++ B/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_CXX + AC_PROG_F77 + AC_PROG_CPP ++AC_PROG_OBJCXX + AC_PROG_MAKE_SET + SAH_LINKS + AC_LANG_PUSH(C) +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) + ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++ + dnl ====================================================================== + dnl some more vodoo required for building portable client-binary (client, clientgui) + dnl ======================================================================
meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch new file +92 -0
92 lines not on this page · raw message
meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch new file +13 -0
@@ -0,0 +1,13 @@ +Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +=================================================================== +--- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 ++++ boinc-client_release-7.6-7.6.33/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)
meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
2.10.0
PATCH 2/16 libbonobo: Fix missing dep on orbit2-native and build with clang
--- meta-gnome/recipes-gnome/bonobo/libbonobo.inc | 2 +- .../libbonobo/fix-nonliteral-in-string.patch | 26 ++++++++++++++++++++++ .../recipes-gnome/bonobo/libbonobo_2.32.1.bb | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch
meta-gnome/recipes-gnome/bonobo/libbonobo.inc +1 -1
@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" SECTION = "x11/gnome/libs" -DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib" +DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" inherit gnomebase gtk-doc lib_package
meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch new file +26 -0
@@ -0,0 +1,26 @@ +This checks whether the format string is a literal on the calling function. As bonobo_debug_print() +takes already a va_list, we specify the format on the functions that call it +The second number, which is 0 here, should then be the argument index of the variadic argument + +Fixed warning with clang + +| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| vfprintf (_bonobo_debug_file, fmt, args); +| ^~~ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +Index: libbonobo-2.32.1/bonobo/bonobo-debug.c +=================================================================== +--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c ++++ libbonobo-2.32.1/bonobo/bonobo-debug.c +@@ -47,6 +47,7 @@ bonobo_debug_init(void) + _bonobo_debug_file = stderr; + } + ++__attribute__((__format__ (printf, 2, 0))) + void + bonobo_debug_print (const char *name, char *fmt, ...) + {
meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +1 -0
@@ -2,6 +2,7 @@ require libbonobo.inc SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ file://do-not-use-srcdir-variable.patch \ + file://fix-nonliteral-in-string.patch \ " SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"
Signature · 1 line
2.10.0
Re: [meta-gnome][PATCH 02/16] libbonobo: Fix missing dep on orbit2-native and build with clang
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>
Is this or any of the other fixes applicable to Morty?
- armin
Quoted 64 lines
--- meta-gnome/recipes-gnome/bonobo/libbonobo.inc | 2 +- .../libbonobo/fix-nonliteral-in-string.patch | 26 ++++++++++++++++++++++ .../recipes-gnome/bonobo/libbonobo_2.32.1.bb | 1 + 3 files changed, 28 insertions(+), 1 deletion(-)create mode 100644
meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patchmeta-gnome/recipes-gnome/bonobo/libbonobo.inc +1
-1@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" SECTION = "x11/gnome/libs" -DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib" +DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" inherit gnomebase gtk-doc lib_packagemeta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch new file +26
-0@@ -0,0 +1,26 @@ +This checks whether the format string is a literal on the calling function. As bonobo_debug_print() +takes already a va_list, we specify the format on the functions that call it +The second number, which is 0 here, should then be the argument index of the variadic argument + +Fixed warning with clang + +| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| vfprintf (_bonobo_debug_file, fmt, args); +| ^~~ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +Index: libbonobo-2.32.1/bonobo/bonobo-debug.c +=================================================================== +--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c ++++ libbonobo-2.32.1/bonobo/bonobo-debug.c +@@ -47,6 +47,7 @@ bonobo_debug_init(void) + _bonobo_debug_file = stderr; + } + ++__attribute__((__format__ (printf, 2, 0))) + void + bonobo_debug_print (const char *name, char *fmt, ...) + {meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +1
-0@@ -2,6 +2,7 @@ require libbonobo.inc SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ file://do-not-use-srcdir-variable.patch \ + file://fix-nonliteral-in-string.patch \ " SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"
Re: [meta-gnome][PATCH 02/16] libbonobo: Fix missing dep on orbit2-native and build with clang
Quoted 8 lines · On Wed, Oct 19, 2016 at 1:09 PM, akuster808 <[email protected]> wrote:
Quoted 2 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>Is this or any of the other fixes applicable to Morty?
I believe so.
Quoted 86 lines
- armin
Quoted 75 lines
--- meta-gnome/recipes-gnome/bonobo/libbonobo.inc | 2 +- .../libbonobo/fix-nonliteral-in-string.patch | 26 ++++++++++++++++++++++ .../recipes-gnome/bonobo/libbonobo_2.32.1.bb | 1 + 3 files changed, 28 insertions(+), 1 deletion(-)create mode 100644
meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patchmeta-gnome/recipes-gnome/bonobo/libbonobo.inc +0
-0@@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
SECTION = "x11/gnome/libs"meta-gnome/recipes-gnome/bonobo/libbonobo.inc +1
-1-DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib" +DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbusdbus-glib"
inherit gnomebase gtk-doclib_package
diff --gita/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patchb/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patchnew file mode 100644
index 0000000..20db671
---/dev/null
+++b/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patchmeta-gnome/recipes-gnome/bonobo/libbonobo.inc +1
-0@@ -0,0 +1,26 @@ +This checks whether the format string is a literal on the callingfunction. As
bonobo_debug_print()
+takes already ava_list, we specify the format on the functions that call it
+The second number, which is 0 here, should then be the argument index of the variadic argumentmeta-gnome/recipes-gnome/bonobo/libbonobo.inc +4
-0+ +Fixed warning with clang + +| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: formatstring is not a string literal [-Werror,-Wformat-nonliteral]
+| vfprintf (_bonobo_debug_file, fmt, args); +| ^~~ +| 1 error generated.meta-gnome/recipes-gnome/bonobo/libbonobo.inc +16
-0+ +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +Index: libbonobo-2.32.1/bonobo/bonobo-debug.c +=================================================================== +--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c ++++ libbonobo-2.32.1/bonobo/bonobo-debug.c +@@ -47,6 +47,7 @@ bonobo_debug_init(void) + _bonobo_debug_file = stderr; + } + ++__attribute__((__format__ (printf, 2, 0))) + void + bonobo_debug_print (const char *name, char *fmt, ...) + {meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +1
-0@@ -2,6 +2,7 @@ require libbonobo.inc SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ file://do-not-use-srcdir-variable.patch \ + file://fix-nonliteral-in-string.patch \ " SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" SRC_URI[archive.sha256sum] =Quoted 1 line
"
9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b"--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 3/16 libmbim: Fix build with clang
In reply to Khem RajWe need to check for clang in configure so
the warning options can be added surgically
depending upon compiler type
--- .../libmbim/libmbim/clang.patch | 73 ++++++++++++++++++++++ .../recipes-connectivity/libmbim/libmbim_1.14.0.bb | 4 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch
meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch new file +73 -0
@@ -0,0 +1,73 @@ +Check for clang compiler since we need to disable +unused-function warning for clang, at same time +pass werror when checking for compiler options if +werror is enabled so spurious options do not get +enabled. Only the ones that are supported by given +compiler are accepted. + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Pending + +Index: libmbim-1.14.0/m4/compiler-warnings.m4 +=================================================================== +--- libmbim-1.14.0.orig/m4/compiler-warnings.m4 ++++ libmbim-1.14.0/m4/compiler-warnings.m4 +@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS], + [AC_ARG_ENABLE(more-warnings, + AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), + set_more_warnings="$enableval",set_more_warnings=error) ++ ++# Clang throws a lot of warnings when it does not understand a flag. Disable ++# this warning for now so other warnings are visible. ++AC_MSG_CHECKING([if compiling with clang]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ ++#ifndef __clang__ ++ not clang ++#endif ++ ]])], ++ [CLANG=yes], ++ [CLANG=no] ++) ++AC_MSG_RESULT([$CLANG]) ++AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) ++CFLAGS="$CFLAGS $CLANG_FLAGS" ++LDFLAGS="$LDFLAGS $CLANG_FLAGS" ++ + AC_MSG_CHECKING(for more warnings) + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + AC_MSG_RESULT(yes) + CFLAGS="-Wall -std=gnu89 $CFLAGS" ++ if test "x$set_more_warnings" = xerror; then ++ WERROR="-Werror" ++ fi + + for option in -Wmissing-declarations -Wmissing-prototypes \ + -Wdeclaration-after-statement -Wstrict-prototypes \ +@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war + -Wmissing-include-dirs -Waggregate-return \ + -Wformat-security; do + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" ++ CFLAGS="$CFLAGS $option $WERROR" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" ++ else ++ CFLAGS="$SAVE_CFLAGS $option" + fi + AC_MSG_RESULT($has_option) + unset has_option + unset SAVE_CFLAGS + done ++ CFLAGS="$CFLAGS $WERROR" + unset option +- if test "x$set_more_warnings" = xerror; then +- CFLAGS="$CFLAGS -Werror" +- fi ++ unset WERROR + else + AC_MSG_RESULT(no) + fi
meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb +3 -1
@@ -11,6 +11,8 @@ DEPENDS = "glib-2.0 libgudev" inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ + file://clang.patch \ +" SRC_URI[md5sum] = "2ed809e65c85353d3ab59e372890e549" SRC_URI[sha256sum] = "ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b"
Signature · 1 line
2.10.0
PATCH 4/16 libplist: Squash warnings found by clang
In reply to Khem Raj--- .../files/0001-Fix-warnings-found-with-clang.patch | 51 ++++++++++++++++++++++ .../libimobiledevice/libplist_1.8.bb | 3 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch
meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch new file +51 -0
@@ -0,0 +1,51 @@ +From ad1be542b87b3186f8ef7bee2c594daefe5bb4c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 18 Oct 2016 21:31:40 +0000 +Subject: [PATCH] Fix warnings found with clang + +| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:107:12: error: non-void function 'base64decode' should return a value [-Wreturn-type] +| if (!buf) return; +| ^ +| /mnt/oe/openembedded-core/build/workspace/sources/libplist/src/base64.c:109:16: error: non-void function 'base64decode' should return a value [-Wreturn-type] +| if (len <= 0) return; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + libcnary/node.c | 2 +- + src/base64.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libcnary/node.c b/libcnary/node.c +index 1f9f669..d6f3f63 100644 +--- a/libcnary/node.c ++++ b/libcnary/node.c +@@ -104,7 +104,7 @@ int node_detach(node_t* parent, node_t* child) { + + int node_insert(node_t* parent, unsigned int index, node_t* child) + { +- if (!parent || !child) return; ++ if (!parent || !child) return -1; + child->isLeaf = TRUE; + child->isRoot = FALSE; + child->parent = parent; +diff --git a/src/base64.c b/src/base64.c +index 65c6061..531a06a 100644 +--- a/src/base64.c ++++ b/src/base64.c +@@ -104,9 +104,9 @@ static int base64decode_block(unsigned char *target, const char *data, size_t da + + unsigned char *base64decode(const char *buf, size_t *size) + { +- if (!buf) return; ++ if (!buf) return 0; + size_t len = strlen(buf); +- if (len <= 0) return; ++ if (len <= 0) return 0; + unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3); + + unsigned char *line; +-- +1.9.1 +
meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb +2 -1
@@ -10,7 +10,8 @@ inherit cmake pkgconfig SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ file://fix-parallel-make.patch \ -" + file://0001-Fix-warnings-found-with-clang.patch \ + " SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec"
Signature · 1 line
2.10.0
PATCH 5/16 frame: Fix build with clang
In reply to Khem Raj--- .../frame/pessimizing-move.patch | 27 ++++++++++++++++++++++ .../canonical-multitouch/frame_2.5.0.bb | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch
meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch new file +27 -0
@@ -0,0 +1,27 @@ +let compiler decide on copy elision +Fixes compiler errors with clang +| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: error: moving a temporary object prevents copy elision [-Werror,-Wpessimizing-move] +| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); +| ^ +| ../../frame-2.5.0/src/x11/device_x11.cpp:126:13: note: remove std::move call here +| std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); +| ^~~~~~~~~~ ~ +| 1 error generated. + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Pending + +Index: frame-2.5.0/src/x11/device_x11.cpp +=================================================================== +--- frame-2.5.0.orig/src/x11/device_x11.cpp ++++ frame-2.5.0/src/x11/device_x11.cpp +@@ -122,8 +122,7 @@ UFDeviceX11::UFDeviceX11(Display* displa + UFAxis_* axis = new UFAxis(type, valuator_info->min, valuator_info->max, + valuator_info->resolution); + +- axes_[type] = +- std::move(UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis))); ++ axes_[type] = UniqueUFAxis(static_cast<oif::frame::UFAxis*>(axis)); + + axis_map_[valuator_info->number] = type; +
meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +2 -1
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = " \ inherit autotools pkgconfig -SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \ + file://pessimizing-move.patch" SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68" SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f"
Signature · 1 line
2.10.0
PATCH 6/16 python-greenlet: Rename register from rX to xX for aarch64
In reply to Khem Raj--- ...x-instead-of-r-for-aarch64-register-names.patch | 38 ++++++++++++++++++++++ .../python/python-greenlet_0.4.9.bb | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-greenlet/0001-Use-x-instead-of-r-for-aarch64-register-names.patch
meta-python/recipes-devtools/python/python-greenlet/0001-Use-x-instead-of-r-for-aarch64-register-names.patch new file +38 -0
@@ -0,0 +1,38 @@ +From b53fb3bf861f895034452e984f2accb8bebbd3c9 Mon Sep 17 00:00:00 2001 +From: Fredrik Fornwall <[email protected]> +Date: Wed, 7 Sep 2016 09:25:54 +0200 +Subject: [PATCH] Use x instead of r for aarch64 register names + +This fixes clang compatibility. +--- +Upstream-Status: Backport + + platform/switch_aarch64_gcc.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/platform/switch_aarch64_gcc.h b/platform/switch_aarch64_gcc.h +index 2fbc569..0b9d556 100644 +--- a/platform/switch_aarch64_gcc.h ++++ b/platform/switch_aarch64_gcc.h +@@ -2,6 +2,7 @@ + * this is the internal transfer function. + * + * HISTORY ++ * 07-Sep-16 Add clang support using x register naming. Fredrik Fornwall + * 13-Apr-13 Add support for strange GCC caller-save decisions + * 08-Apr-13 File creation. Michael Matz + * +@@ -15,8 +16,8 @@ + + #ifdef SLP_EVAL + #define STACK_MAGIC 0 +-#define REGS_TO_SAVE "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", \ +- "r27", "r28", "r30" /* aka lr */, \ ++#define REGS_TO_SAVE "x19", "x20", "x21", "x22", "x23", "x24", "x25", "x26", \ ++ "x27", "x28", "x30" /* aka lr */, \ + "v8", "v9", "v10", "v11", \ + "v12", "v13", "v14", "v15" + +-- +1.9.1 +
meta-python/recipes-devtools/python/python-greenlet_0.4.9.bb +3 -0
@@ -3,6 +3,9 @@ LICENSE = "MIT & PSF" LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" +SRC_URI += "\ + file://0001-Use-x-instead-of-r-for-aarch64-register-names.patch \ + " SRC_URI[md5sum] = "c6659cdb2a5e591723e629d2eef22e82" SRC_URI[sha256sum] = "58b2f3a2e7075c655616bf95e82868db4980f3bb6661db70ad02a51e4ddd2252"
Signature · 1 line
2.10.0
PATCH 7/16 libdc1394: Upgrade to 2.2.4
In reply to Khem Raj--- meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +2 -2
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl" -PV = "2.2.1+gitr${SRCPV}" +PV = "2.2.4+gitr${SRCPV}" -SRCREV = "b90342933b4b48634b98b73805f47bd25ed5857e" +SRCREV = "9ac63fe7a7561bea83bfd4a5db47d4d74fde43a6" SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \ file://install_examples.patch \
Signature · 1 line
2.10.0
PATCH 8/16 lowpan-tools: Fix errors found with clang
In reply to Khem Raj--- .../0001-Fix-build-errors-with-clang.patch | 34 ++++++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 6 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 5f9e80acb0a1ac399839bf160e43f6120c4b5128 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 18 Oct 2016 23:49:09 +0000 +Subject: [PATCH] Fix build errors with clang + +| ../../../../../../../workspace/sources/lowpan-tools/src/coordinator.c:313:50: error: format specifies type 'unsigned char' but the argument has type 'int' [-Werror,-Wformat] +| fprintf(stderr, "Opt: %c (%hhx)\n", (char)opt, opt); +| ~~~~ ^~~ +| %x +| 1 error generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + src/coordinator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/coordinator.c b/src/coordinator.c +index c139aae..f0de6d2 100644 +--- a/src/coordinator.c ++++ b/src/coordinator.c +@@ -310,7 +310,7 @@ int main(int argc, char **argv) + #else + opt = getopt(argc, argv, "l:f:d:m:n:i:s:p:c:hv"); + #endif +- fprintf(stderr, "Opt: %c (%hhx)\n", opt, opt); ++ fprintf(stderr, "Opt: %c (%hhx)\n", opt, (unsigned char)opt); + if (opt == -1) + break; + +-- +1.9.1 +
meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +5 -1
@@ -9,7 +9,9 @@ DEPENDS = "flex-native bison-native libnl python" PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ - file://no-help2man.patch" + file://no-help2man.patch \ + file://0001-Fix-build-errors-with-clang.patch \ + " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" S = "${WORKDIR}/git"
@@ -18,6 +20,8 @@ inherit autotools python-dir pkgconfig CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" +CFLAGS += "-Wno-initializer-overrides" + do_install_append() { rmdir ${D}${localstatedir}/run }
Signature · 1 line
2.10.0
PATCH 9/16 gpm: Remove nested functions
In reply to Khem RajHelps compiling with clang which doesnt support
nested functions
--- .../gpm/gpm-1.99.7/remove_nested_functions.patch | 326 +++++++++++++++++++++ meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 1 + 2 files changed, 327 insertions(+) create mode 100644 meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch
meta-oe/recipes-support/gpm/gpm-1.99.7/remove_nested_functions.patch new file +326 -0
@@ -0,0 +1,326 @@ +Remove nested functions, they are not available in all compilers +e.g. clang will not support them. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +Index: gpm-1.99.7/src/drivers/summa/i.c +=================================================================== +--- gpm-1.99.7.orig/src/drivers/summa/i.c ++++ gpm-1.99.7/src/drivers/summa/i.c +@@ -36,6 +36,28 @@ extern int summamaxy; + + extern signed char summaid; + ++static void resetsumma(int fd) ++{ ++ write(fd, 0, 1); /* Reset */ ++ usleep(400000); /* wait */ ++} ++ ++static int waitsumma(int fd) ++{ ++ struct timeval timeout; ++ ++ fd_set readfds; ++ ++ int err; ++ ++ FD_ZERO(&readfds); ++ FD_SET(fd, &readfds); ++ timeout.tv_sec = 0; ++ timeout.tv_usec = 200000; ++ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); ++ return (err); ++} ++ + Gpm_Type *I_summa(int fd, unsigned short flags, struct Gpm_Type *type, int argc, + char **argv) + { +@@ -43,24 +65,6 @@ Gpm_Type *I_summa(int fd, unsigned short + flags = argc = 0; /* FIXME: 1.99.13 */ + argv = NULL; + +- void resetsumma() { +- write(fd, 0, 1); /* Reset */ +- usleep(400000); /* wait */ +- } +- int waitsumma() { +- struct timeval timeout; +- +- fd_set readfds; +- +- int err; +- +- FD_ZERO(&readfds); +- FD_SET(fd, &readfds); +- timeout.tv_sec = 0; +- timeout.tv_usec = 200000; +- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); +- return (err); +- } + int err; + + char buffer[255]; +@@ -91,7 +95,7 @@ Gpm_Type *I_summa(int fd, unsigned short + */ + setspeed(fd, 1200, 9600, 1, + B9600 | CS8 | CREAD | CLOCAL | HUPCL | PARENB | PARODD); +- resetsumma(); ++ resetsumma(fd); + + write(fd, SS_PROMPT_MODE, strlen(SS_PROMPT_MODE)); + +@@ -103,7 +107,7 @@ Gpm_Type *I_summa(int fd, unsigned short + * read the Summa Firm-ID + */ + write(fd, SS_FIRMID, strlen(SS_FIRMID)); +- err = waitsumma(); ++ err = waitsumma(fd); + if(!((err == -1) || (!err))) { + summaid = 10; /* Original Summagraphics */ + read(fd, buffer, 255); /* Read Firm-ID */ +@@ -111,14 +115,14 @@ Gpm_Type *I_summa(int fd, unsigned short + } + + if(summaid < 0) { /* Genius-test */ +- resetsumma(); ++ resetsumma(fd); + write(fd, GEN_MMSERIES, 1); + write(fd, &GEN_MODELL, 1); /* Read modell */ +- err = waitsumma(); ++ err = waitsumma(fd); + if(!((err == -1) || (!err))) { /* read Genius-ID */ +- err = waitsumma(); ++ err = waitsumma(fd); + if(!((err == -1) || (!err))) { +- err = waitsumma(); ++ err = waitsumma(fd); + if(!((err == -1) || (!err))) { + read(fd, &config, 1); + summaid = (config[0] & 224) >> 5; /* genius tablet-id +@@ -135,14 +139,14 @@ Gpm_Type *I_summa(int fd, unsigned short + * unknown tablet ? + */ + if((summaid < 0) || (summaid == 11)) { +- resetsumma(); ++ resetsumma(fd); + write(fd, SS_BINARY_FMT SS_PROMPT_MODE, 3); + } + + /* + * read tablet size + */ +- err = waitsumma(); ++ err = waitsumma(fd); + if(!((err == -1) || (!err))) + read(fd, buffer, sizeof(buffer)); + write(fd, SS_READCONFIG, 1); +Index: gpm-1.99.7/src/drivers/wacom/i.c +=================================================================== +--- gpm-1.99.7.orig/src/drivers/wacom/i.c ++++ gpm-1.99.7/src/drivers/wacom/i.c +@@ -30,10 +30,6 @@ + #include "message.h" /* gpm_report */ + #include "wacom.h" /* wacom */ + +-Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, +- char **argv) +-{ +- + /* wacom graphire tablet */ + #define UD_RESETBAUD "\r$" /* reset baud rate to default (wacom V) */ + /* +@@ -45,83 +41,91 @@ Gpm_Type *I_wacom(int fd, unsigned short + #define UD_COORD "~C\r" /* Request max coordinates */ + #define UD_STOP "\nSP\r" /* stop sending coordinates */ + +- flags = 0; /* FIXME: 1.99.13 */ + +- void reset_wacom() { +- /* +- * Init Wacom communication; this is modified from xf86Wacom.so module +- */ +- /* +- * Set speed to 19200 +- */ +- setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); +- /* +- * Send Reset Baudrate Command +- */ +- write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); +- usleep(250000); +- /* +- * Send Reset Command +- */ +- write(fd, UD_RESET, strlen(UD_RESET)); +- usleep(75000); +- /* +- * Set speed to 9600bps +- */ +- setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); +- /* +- * Send Reset Command +- */ +- write(fd, UD_RESET, strlen(UD_RESET)); +- usleep(250000); +- write(fd, UD_STOP, strlen(UD_STOP)); +- usleep(100000); +- } ++static void reset_wacom(int fd) ++{ ++ /* ++ * Init Wacom communication; this is modified from xf86Wacom.so module ++ */ ++ /* ++ * Set speed to 19200 ++ */ ++ setspeed(fd, 1200, 19200, 0, B19200 | CS8 | CREAD | CLOCAL | HUPCL); ++ /* ++ * Send Reset Baudrate Command ++ */ ++ write(fd, UD_RESETBAUD, strlen(UD_RESETBAUD)); ++ usleep(250000); ++ /* ++ * Send Reset Command ++ */ ++ write(fd, UD_RESET, strlen(UD_RESET)); ++ usleep(75000); ++ /* ++ * Set speed to 9600bps ++ */ ++ setspeed(fd, 1200, 9600, 0, B9600 | CS8 | CREAD | CLOCAL | HUPCL); ++ /* ++ * Send Reset Command ++ */ ++ write(fd, UD_RESET, strlen(UD_RESET)); ++ usleep(250000); ++ write(fd, UD_STOP, strlen(UD_STOP)); ++ usleep(100000); ++} + +- int wait_wacom() { +- /* +- * Wait up to 200 ms for Data from Tablet. +- * Do not read that data. +- * Give back 0 on timeout condition, -1 on error and 1 for DataPresent +- */ +- struct timeval timeout; +- +- fd_set readfds; +- +- int err; +- +- FD_ZERO(&readfds); +- FD_SET(fd, &readfds); +- timeout.tv_sec = 0; +- timeout.tv_usec = 200000; +- err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); +- return ((err > 0) ? 1 : err); +- } ++static int wait_wacom(int fd) ++{ ++ /* ++ * Wait up to 200 ms for Data from Tablet. ++ * Do not read that data. ++ * Give back 0 on timeout condition, -1 on error and 1 for DataPresent ++ */ ++ struct timeval timeout; + +- char buffer[50], *p; ++ fd_set readfds; + +- int RequestData(char *cmd) { +- int err; ++ int err; + +- /* +- * Send cmd if not null, and get back answer from tablet. +- * Get Data to buffer until full or timeout. +- * Give back 0 for timeout and !0 for buffer full +- */ +- if(cmd) +- write(fd, cmd, strlen(cmd)); +- memset(buffer, 0, sizeof(buffer)); +- p = buffer; +- err = wait_wacom(); +- while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { +- p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); +- err = wait_wacom(); +- } +- /* +- * return 1 for buffer full +- */ +- return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); ++ FD_ZERO(&readfds); ++ FD_SET(fd, &readfds); ++ timeout.tv_sec = 0; ++ timeout.tv_usec = 200000; ++ err = select(FD_SETSIZE, &readfds, NULL, NULL, &timeout); ++ return ((err > 0) ? 1 : err); ++} ++ ++static int RequestData(int fd, char *cmd, char *buffer) ++{ ++ int err; ++ char *p; ++ /* ++ * Send cmd if not null, and get back answer from tablet. ++ * Get Data to buffer until full or timeout. ++ * Give back 0 for timeout and !0 for buffer full ++ */ ++ if(cmd) ++ write(fd, cmd, strlen(cmd)); ++ memset(buffer, 0, sizeof(buffer)); ++ p = buffer; ++ err = wait_wacom(fd); ++ while(err != -1 && err && (p - buffer) < (int) (sizeof(buffer) - 1)) { ++ p += read(fd, p, (sizeof(buffer) - 1) - (p - buffer)); ++ err = wait_wacom(fd); + } ++ /* ++ * return 1 for buffer full ++ */ ++ return ((strlen(buffer) >= (sizeof(buffer) - 1)) ? !0 : 0); ++} ++ ++Gpm_Type *I_wacom(int fd, unsigned short flags, struct Gpm_Type *type, int argc, ++ char **argv) ++{ ++ ++ flags = 0; /* FIXME: 1.99.13 */ ++ ++ char buffer[50]; + + /* + * We do both modes, relative and absolute, with the same function. +@@ -143,17 +147,17 @@ Gpm_Type *I_wacom(int fd, unsigned short + }; + parse_argv(optioninfo, argc, argv); + type->absolute = WacomAbsoluteWanted; +- reset_wacom(); ++ reset_wacom(fd); + + /* + * "Flush" input queque + */ +- while(RequestData(NULL)) ; ++ while(RequestData(fd, NULL, buffer)) ; + + /* + * read WACOM-ID + */ +- RequestData(UD_FIRMID); ++ RequestData(fd, UD_FIRMID, buffer); + + /* + * Search for matching modell +@@ -180,7 +184,7 @@ Gpm_Type *I_wacom(int fd, unsigned short + * read Wacom max size + */ + if(WacomModell != (-1) && (!wcmodell[WacomModell].maxX)) { +- RequestData(UD_COORD); ++ RequestData(fd, UD_COORD, buffer); + sscanf(buffer + 2, "%d,%d", &wmaxx, &wmaxy); + wmaxx = (wmaxx - wcmodell[WacomModell].border); + wmaxy = (wmaxy - wcmodell[WacomModell].border);
meta-oe/recipes-support/gpm/gpm_1.99.7.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ file://no-docs.patch \ file://processcreds.patch \ file://eglibc-2.17.patch \ + file://remove_nested_functions.patch \ file://init" inherit autotools-brokensep update-rc.d
Signature · 1 line
2.10.0
PATCH 10/16 flashrom: Fix build with clang and aarch64
In reply to Khem Raj--- .../flashrom/0001-Fix-compilation-on-aarch64.patch | 62 +++++++++++++++++++ ...utological-pointer-compare-when-using-cla.patch | 35 +++++++++++ .../0003-remove-duplicate-const-qualifiers.patch | 71 ++++++++++++++++++++++ .../recipes-extended/flashrom/flashrom_0.9.6.1.bb | 8 ++- 4 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch create mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch create mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch
meta-oe/recipes-extended/flashrom/flashrom/0001-Fix-compilation-on-aarch64.patch new file +62 -0
@@ -0,0 +1,62 @@ +From d9e4dc750dc45e42b482d744829254a3672c11b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 00:24:08 +0000 +Subject: [PATCH 1/3] Fix compilation on aarch64 + +Signed-off-by: Khem Raj <[email protected]> +--- + arch.h | 2 +- + hwaccess.c | 2 +- + hwaccess.h | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +Index: flashrom-0.9.6.1/arch.h +=================================================================== +--- flashrom-0.9.6.1.orig/arch.h ++++ flashrom-0.9.6.1/arch.h +@@ -27,7 +27,7 @@ + #define __FLASHROM_ARCH__ "mips" + #elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) + #define __FLASHROM_ARCH__ "ppc" +-#elif defined(__arm__) ++#elif defined(__arm__) || defined(__aarch64__) + #define __FLASHROM_ARCH__ "arm" + #endif + __FLASHROM_ARCH__ +Index: flashrom-0.9.6.1/hwaccess.c +=================================================================== +--- flashrom-0.9.6.1.orig/hwaccess.c ++++ flashrom-0.9.6.1/hwaccess.c +@@ -121,7 +121,7 @@ int rget_io_perms(void) + return 0; + } + +-#elif defined (__arm__) ++#elif defined (__arm__) || defined (__aarch64__) + + static inline void sync_primitive(void) + { +Index: flashrom-0.9.6.1/hwaccess.h +=================================================================== +--- flashrom-0.9.6.1.orig/hwaccess.h ++++ flashrom-0.9.6.1/hwaccess.h +@@ -68,8 +68,8 @@ + #error Little-endian PowerPC #defines are unknown + #endif + +-#elif defined (__arm__) +-#if defined (__ARMEL__) ++#elif defined (__arm__) || defined (__aarch64__) ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define __FLASHROM_LITTLE_ENDIAN__ 1 + #else + #error Big-endian ARM #defines are unknown +@@ -337,7 +337,7 @@ int libpayload_wrmsr(int addr, msr_t msr + + /* PCI port I/O is not yet implemented on MIPS. */ + +-#elif defined(__arm__) ++#elif defined(__arm__) || defined (__aarch64__) + + /* Non memory mapped I/O is not supported on ARM. */ +
meta-oe/recipes-extended/flashrom/flashrom/0002-Disable-Wtautological-pointer-compare-when-using-cla.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 9be0d152dfe8ac0f9b665d61aeb3f99dae533e0f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 00:25:09 +0000 +Subject: [PATCH 2/3] Disable Wtautological-pointer-compare when using clang + +Signed-off-by: Khem Raj <[email protected]> +--- + flashrom.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/flashrom.c b/flashrom.c +index 04e9934..bf49104 100644 +--- a/flashrom.c ++++ b/flashrom.c +@@ -1569,6 +1569,9 @@ int selfcheck(void) + * For 'flashchips' we check the first element to be non-null. In the + * other cases there exist use cases where the first element can be + * null. */ ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wtautological-pointer-compare" ++ + if (flashchips == NULL || flashchips[0].vendor == NULL) { + msg_gerr("Flashchips table miscompilation!\n"); + ret = 1; +@@ -1602,6 +1605,7 @@ int selfcheck(void) + msg_gerr("Known laptops table does not exist!\n"); + ret = 1; + } ++#pragma clang diagnostic pop + #endif + return ret; + } +-- +1.9.1 +
meta-oe/recipes-extended/flashrom/flashrom/0003-remove-duplicate-const-qualifiers.patch new file +71 -0
71 lines not on this page · raw message
meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb +7 -1
@@ -5,11 +5,17 @@ HOMEPAGE = "http://flashrom.org" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pciutils" -SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2" +SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ + file://0001-Fix-compilation-on-aarch64.patch \ + file://0002-Disable-Wtautological-pointer-compare-when-using-cla.patch \ + file://0003-remove-duplicate-const-qualifiers.patch \ + " SRC_URI[md5sum] = "407e836c0a2b17ec76583cb6809f65e5" SRC_URI[sha256sum] = "6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a" +CFLAGS += "-Wno-error=unknown-pragmas" + do_install() { oe_runmake PREFIX=${prefix} DESTDIR=${D} install }
Signature · 1 line
2.10.0
PATCH 11/16 openl2tp: Fix build with clang
In reply to Khem RajFix a typo in compile cmdline specified viaEXTRA_OECMAKE
--- .../0001-test-pppd_dummy.c-Fix-return-value.patch | 38 ++++++++++++++++++++++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 5 +-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch
meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch new file +38 -0
@@ -0,0 +1,38 @@ +From ce5f5563ab54db9d28dba44a0e25e8a8c7bb9876 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 00:34:35 +0000 +Subject: [PATCH] test/pppd_dummy.c: Fix return value + +pause() is defined in unistd.h, clang does not +like the fact that we are using a function without +declaration + +Signed-off-by: Khem Raj <[email protected]> +--- + test/pppd_dummy.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/pppd_dummy.c b/test/pppd_dummy.c +index 148e7d2..b564c36 100644 +--- a/test/pppd_dummy.c ++++ b/test/pppd_dummy.c +@@ -26,6 +26,7 @@ + #include <sys/types.h> + #include <sys/wait.h> + #include <syslog.h> ++#include <unistd.h> + + #define PPPD_DUMMY_TMP_FILE "/tmp/pppd_dummy" + +@@ -40,7 +41,7 @@ int main(int argc, char **argv) + + if (file == NULL) { + syslog(LOG_ERR, "Failed to open %s\n", filename); +- return; ++ return -1; + } + + for (arg = 1; arg < argc; arg++) { +-- +1.9.1 +
meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +3 -2
@@ -15,14 +15,15 @@ SRC_URI = "http://ftp.jaist.ac.jp/pub/sourceforge/o/op/${PN}/${PN}/${PV}/${BP}.t file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ file://openl2tp-simplify-gcc-warning-hack.patch \ file://Makefile-obey-LDFLAGS.patch \ - " + file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-nused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \
Signature · 1 line
2.10.0
PATCH 12/16 glcompbench: Demand c++11 explicitly
In reply to Khem RajHelps in fixing build issues when default std of C++ compiler is older
--- .../0001-build-Specify-std-c-11-on-cmdline.patch | 45 ++++++++++++++++++++++ .../glcompbench/glcompbench_2012.08.bb | 4 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/glcompbench/glcompbench/0001-build-Specify-std-c-11-on-cmdline.patch
meta-oe/recipes-graphics/glcompbench/glcompbench/0001-build-Specify-std-c-11-on-cmdline.patch new file +45 -0
@@ -0,0 +1,45 @@ +From 47bfef0dd83ed2e10ec4c615908ec926c4d5fe2e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 00:56:54 +0000 +Subject: [PATCH] build: Specify -std=c++11 on cmdline + +We use c++11 features so demand it explicitly from compiler + +Fixes +| ../src/libmatrix/shader-source.cc:37:10: error: no member named 'unique_ptr' in namespace 'std' +| std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); +| ~~~~~^ +| ../src/libmatrix/shader-source.cc:37:33: error: expected '(' for function-style cast or type construction +| std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); +| ~~~~~~~~~~~~^ +| ../src/libmatrix/shader-source.cc:37:35: error: use of undeclared identifier 'is_ptr' +| std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename)); +| ^ +| ../src/libmatrix/shader-source.cc:38:30: error: use of undeclared identifier 'is_ptr' +| std::istream& inputFile(*is_ptr); +| ^ +| 4 errors generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index dcaf298..485a9fb 100644 +--- a/wscript ++++ b/wscript +@@ -79,7 +79,7 @@ def configure(ctx): + ctx.check_cfg(package = pkg, uselib_store = uselib, args = '--cflags --libs', + mandatory = True) + +- ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -Wextra'.split(' ')) ++ ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -std=c++11 -Wextra'.split(' ')) + + # Prepend -O# and -g flags so that they can be overriden by the CFLAGS environment variable + if Options.options.opt: +-- +1.9.1 +
meta-oe/recipes-graphics/glcompbench/glcompbench_2012.08.bb +3 -1
@@ -9,7 +9,9 @@ SRC_URI = "https://launchpad.net/glcompbench/trunk/${PV}/+download/${BPN}-${PV}. file://glbench-compile-fix.patch \ file://Fix-configure-for-sqrt-check.patch \ file://Fix_space_issues.patch \ - file://Fix_auto_ptr_deprecated.patch" + file://Fix_auto_ptr_deprecated.patch \ + file://0001-build-Specify-std-c-11-on-cmdline.patch \ +" SRC_URI[md5sum] = "c939d9156fe940960098f38707fea827" SRC_URI[sha256sum] = "b04b738cec06c6786ceafa86e4735fd8b971c078265754854ef356b0379542ee"
Signature · 1 line
2.10.0
PATCH 13/16 joe: Fix build with clang
In reply to Khem Raj--- .../joe/joe/0001-adjust-signature-of-main.patch | 30 ++++++++++++++++++++++ meta-oe/recipes-support/joe/joe_3.1.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch
meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 27e4639254f2b2eb7d04790bd8cf16ecfcbac1c2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 01:07:16 +0000 +Subject: [PATCH] adjust signature of main() + +clang complains about the types of main() function + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index 81ba543..ee7506c 100644 +--- a/main.c ++++ b/main.c +@@ -159,7 +159,7 @@ extern int breakflg; + + unsigned char **mainenv; + +-int main(int argc, unsigned char **argv, unsigned char **envv) ++int main(int argc, char **argv, char **envv) + { + CAP *cap; + unsigned char *s; +-- +1.9.1 +
meta-oe/recipes-support/joe/joe_3.1.bb +3 -1
@@ -4,7 +4,9 @@ HOMEPAGE = "http://joe-editor.sourceforge.net/" LICENSE = "GPLv1" LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6" -SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz \ + file://0001-adjust-signature-of-main.patch \ + " PACKAGECONFIG ??= "curses" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo"
Signature · 1 line
2.10.0
PATCH 14/16 fwts: Update to 16.09 release
In reply to Khem Rajlicense change is just year change from 2014 to 2016 Fix build with clang while here
--- ...nstant-logical-operand-warning-with-clang.patch | 81 ++++++++++++++++++++++ meta-oe/recipes-test/fwts/fwts_git.bb | 15 ++-- 2 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch new file +81 -0
@@ -0,0 +1,81 @@ +From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 01:57:16 +0000 +Subject: [PATCH] ignore constant-logical-operand warning with clang + +Signed-off-by: Khem Raj <[email protected]> +--- + src/uefi/uefirtauthvar/uefirtauthvar.c | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: git/src/uefi/uefirtauthvar/uefirtauthvar.c +=================================================================== +--- git.orig/src/uefi/uefirtauthvar/uefirtauthvar.c ++++ git/src/uefi/uefirtauthvar/uefirtauthvar.c +@@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_fra + return FWTS_OK; + } + ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wconstant-logical-operand" ++ + static int check_fw_support(fwts_framework *fw, uint64_t status) + { + if ((status == EFI_INVALID_PARAMETER) && +@@ -172,6 +175,8 @@ static int check_fw_support(fwts_framewo + return FWTS_OK; + } + ++#pragma clang diagnostic pop ++ + /* + * Set the created authenticated variable, AuthVarCreate, + * and checking the data size and data. +Index: git/src/lib/src/fwts_acpi_tables.c +=================================================================== +--- git.orig/src/lib/src/fwts_acpi_tables.c ++++ git/src/lib/src/fwts_acpi_tables.c +@@ -392,10 +392,14 @@ static int fwts_acpi_handle_fadt( + /* Determine FACS addr and load it. + * Will ignore the missing FACS in the hardware-reduced mode. + */ ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Waddress-of-packed-member" ++ + result = fwts_acpi_handle_fadt_tables(fw, fadt, + "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", + &fadt->firmware_control, &fadt->x_firmware_ctrl, + provenance); ++ + if (result != FWTS_OK) { + if ((result == FWTS_NULL_POINTER) && + fwts_acpi_is_reduced_hardware(fadt)) { +@@ -414,6 +418,7 @@ static int fwts_acpi_handle_fadt( + return FWTS_ERROR; + } + return FWTS_OK; ++#pragma clang diagnostic pop + } + + /* +Index: git/src/dmi/dmicheck/dmicheck.c +=================================================================== +--- git.orig/src/dmi/dmicheck/dmicheck.c ++++ git/src/dmi/dmicheck/dmicheck.c +@@ -209,6 +209,8 @@ static const char *uuid_patterns[] = { + "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", + NULL, + }; ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" + + static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { + { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, +@@ -245,6 +247,7 @@ static const fwts_chassis_type_map fwts_ + { "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE }, + { "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE }, + }; ++#pragma clang diagnostic pop + + /* Remapping table from buggy version numbers to correct values */ + static const fwts_dmi_version dmi_versions[] = {
meta-oe/recipes-test/fwts/fwts_git.bb +10 -5
@@ -3,12 +3,14 @@ DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -PV = "14.12.00" +PV = "16.09.00" -SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69" -SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git" +SRCREV = "7fd1834a879f27647b371c18284868c9a54f6474" +SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ + file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ + " S = "${WORKDIR}/git"
@@ -16,9 +18,12 @@ DEPENDS = "libpcre json-c glib-2.0" inherit autotools-brokensep -CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation" +CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" FILES_${PN}-dbg += "${libdir}/fwts/.debug" + +TOOLCHAIN = "gcc" +
Signature · 1 line
2.10.0
Re: [meta-oe][PATCH 14/16] fwts: Update to 16.09 release
Quoted 2 lines · Khem Raj
license change is just year change from 2014 to 2016 Fix build with clang while here
fwts-16.09.00: fwts rdepends on dtc, but it isn't a build dependency, missing dtc in DEPENDS or PACKAGECONFIG? [build-deps]
and for qemuarm it even fails to build:
http://errors.yoctoproject.org/Errors/Details/93027/
Quoted 140 lines
Signed-off-by Khem Raj <[email protected]>--- ...nstant-logical-operand-warning-with-clang.patch | 81 ++++++++++++++++++++++ meta-oe/recipes-test/fwts/fwts_git.bb | 15 ++-- 2 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patchmeta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch new file +81
-0@@ -0,0 +1,81 @@ +From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 19 Oct 2016 01:57:16 +0000 +Subject: [PATCH] ignore constant-logical-operand warning with clang + +Signed-off-by: Khem Raj <[email protected]> +--- + src/uefi/uefirtauthvar/uefirtauthvar.c | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: git/src/uefi/uefirtauthvar/uefirtauthvar.c +=================================================================== +--- git.orig/src/uefi/uefirtauthvar/uefirtauthvar.c ++++ git/src/uefi/uefirtauthvar/uefirtauthvar.c +@@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_fra + return FWTS_OK; + } + ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wconstant-logical-operand" ++ + static int check_fw_support(fwts_framework *fw, uint64_t status) + { + if ((status == EFI_INVALID_PARAMETER) && +@@ -172,6 +175,8 @@ static int check_fw_support(fwts_framewo + return FWTS_OK; + } + ++#pragma clang diagnostic pop ++ + /* + * Set the created authenticated variable, AuthVarCreate, + * and checking the data size and data. +Index: git/src/lib/src/fwts_acpi_tables.c +=================================================================== +--- git.orig/src/lib/src/fwts_acpi_tables.c ++++ git/src/lib/src/fwts_acpi_tables.c +@@ -392,10 +392,14 @@ static int fwts_acpi_handle_fadt( + /* Determine FACS addr and load it. + * Will ignore the missing FACS in the hardware-reduced mode. + */ ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Waddress-of-packed-member" ++ + result = fwts_acpi_handle_fadt_tables(fw, fadt, + "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", + &fadt->firmware_control, &fadt->x_firmware_ctrl, + provenance); ++ + if (result != FWTS_OK) { + if ((result == FWTS_NULL_POINTER) && + fwts_acpi_is_reduced_hardware(fadt)) { +@@ -414,6 +418,7 @@ static int fwts_acpi_handle_fadt( + return FWTS_ERROR; + } + return FWTS_OK; ++#pragma clang diagnostic pop + } + + /* +Index: git/src/dmi/dmicheck/dmicheck.c +=================================================================== +--- git.orig/src/dmi/dmicheck/dmicheck.c ++++ git/src/dmi/dmicheck/dmicheck.c +@@ -209,6 +209,8 @@ static const char *uuid_patterns[] = { + "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", + NULL, + }; ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" + + static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { + { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, +@@ -245,6 +247,7 @@ static const fwts_chassis_type_map fwts_ + { "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE }, + { "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE }, + }; ++#pragma clang diagnostic pop + + /* Remapping table from buggy version numbers to correct values */ + static const fwts_dmi_version dmi_versions[] = {meta-oe/recipes-test/fwts/fwts_git.bb +10
-5@@ -3,12 +3,14 @@ DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -PV = "14.12.00" +PV = "16.09.00" -SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69" -SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git" +SRCREV = "7fd1834a879f27647b371c18284868c9a54f6474" +SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ + file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ + " S = "${WORKDIR}/git"@@ -16,9 +18,12 @@ DEPENDS = "libpcre json-c glib-2.0" inherit autotools-brokensep -CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation" +CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" FILES_${PN}-dbg += "${libdir}/fwts/.debug" + +TOOLCHAIN = "gcc" +Signature · 7 lines
2.10.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 15/16 libmnl, nftables: Update versions
In reply to Khem Rajlibmnl -> 1.0.4
nftables -> 0.6
---
.../recipes-filter/libmnl/{libmnl_1.0.3.bb => libmnl_1.0.4.bb} | 4 ++--
.../recipes-filter/nftables/{nftables_0.5.bb => nftables_0.6.bb} | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
rename meta-networking/recipes-filter/libmnl/{libmnl_1.0.3.bb => libmnl_1.0.4.bb} (78%)
rename meta-networking/recipes-filter/nftables/{nftables_0.5.bb => nftables_0.6.bb} (74%)meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb renamed from meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb +2 -2
@@ -7,7 +7,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://www.netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "7d95fc3bea3365bc03c48e484224f65f" -SRC_URI[tar.sha256sum] = "6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de" +SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" +SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" inherit autotools pkgconfig
meta-networking/recipes-filter/nftables/nftables_0.6.bb renamed from meta-networking/recipes-filter/nftables/nftables_0.5.bb +2 -3
@@ -10,8 +10,7 @@ RRECOMMENDS_${PN} += "kernel-module-nf-tables \ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ file://fix-to-generate-ntf.8.patch \ " - -SRC_URI[md5sum] = "94bfe1c54bcb9f6ed974835f2fca8069" -SRC_URI[sha256sum] = "1fb6dff333d8a4fc347cbbe273bf905a2634b27a8c39df0d3a45d5a3fde10ad6" +SRC_URI[md5sum] = "fd320e35fdf14b7be795492189b13dae" +SRC_URI[sha256sum] = "dede62655f1c56f2bc9f9be12d103d930dcef6d5f9e0855854ad9c6f93cd6c2d" inherit autotools pkgconfig
Signature · 1 line
2.10.0
PATCH 16/16 mg: Update to 20161005
In reply to Khem Raj---
.../mg/{mg_20110905.bb => mg_20161005.bb} | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
rename meta-oe/recipes-support/mg/{mg_20110905.bb => mg_20161005.bb} (59%)meta-oe/recipes-support/mg/mg_20161005.bb renamed from meta-oe/recipes-support/mg/mg_20110905.bb +9 -11
@@ -1,15 +1,13 @@ SUMMARY = "A portable version of the mg maintained by the OpenBSD team" HOMEPAGE = "http://homepage.boetes.org/software/mg/" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=811e1b67a5cd60c12b218a2b7c1adbf2" -DEPENDS = "ncurses" +LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ - file://remove_ncurses_check.patch" - -SRC_URI[md5sum] = "2de35316fa8ebafe6003efaae70b723e" -SRC_URI[sha256sum] = "1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229" +SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz" +SRC_URI[md5sum] = "fc6faeeee7308bb46f3512b75867ed51" +SRC_URI[sha256sum] = "b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61" # CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= EXTRA_OEMAKE = "\
@@ -21,13 +19,13 @@ EXTRA_OEMAKE = "\ 'libdir=${libdir}' \ 'includedir=${includedir}' \ 'mandir=${mandir}' \ + 'PKG_CONFIG=pkg-config' \ " -do_configure () { - sed -i Makefile.in -e 's,^prefix=.*,prefix=${prefix},' - ./configure -} +CFLAGS += "-I${STAGING_INCDIR}/bsd" do_install () { oe_runmake install DESTDIR=${D} } + +inherit pkgconfig
Signature · 1 line
2.10.0
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>
Looks like the patches are missing OE patch format. No Upstream-Status or Signoff, etc
- armin
Quoted 219 lines
--- .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 19 +++++ .../boinc/boinc-client/cross-compile.patch | 92 ++++++++++++++++++++++ .../boinc/boinc-client/opengl_m4_check.patch | 13 +++ .../recipes-extended/boinc/boinc-client_7.6.33.bb | 60 ++++++++++++++ 4 files changed, 184 insertions(+)create mode 100644
meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patchcreate mode 100644meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patchcreate mode 100644meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patchcreate mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bbmeta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch new file +19
-0@@ -0,0 +1,19 @@ +--- A/configure.ac ++++ B/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_CXX + AC_PROG_F77 + AC_PROG_CPP ++AC_PROG_OBJCXX + AC_PROG_MAKE_SET + SAH_LINKS + AC_LANG_PUSH(C) +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) + ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++ + dnl ====================================================================== + dnl some more vodoo required for building portable client-binary (client, clientgui) + dnl ======================================================================meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch new file +92
-0@@ -0,0 +1,92 @@ +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/opengl_m4_check.patch new file +13
-0@@ -0,0 +1,13 @@ +Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +=================================================================== +--- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 ++++ boinc-client_release-7.6-7.6.33/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)meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb new file +60
-0@@ -0,0 +1,60 @@ +# Copyright (C) 2016 Khem Raj <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Open-source software for volunteer computing" +DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \ +source software platform which supports distributed computing, primarily in \ +the form of volunteer computing and desktop Grid computing. It is well \ +suited for problems which are often described as trivially parallel. BOINC \ +is the underlying software used by projects such as SETI@home, Einstein@Home, \ +ClimatePrediciton.net, the World Community Grid, and many other distributed \ +computing projects. \ +This package installs the BOINC client software, which will allow your \ +computer to participate in one or more BOINC projects, using your spare \ +computer time to search for cures for diseases, model protein folding, study \ +global warming, discover sources of gravitational waves, and many other types \ +of scientific and mathematical research." + +HOMEPAGE = "http://boinc.berkeley.edu/" +LICENSE = "LGPLv2+ & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" +SECTION = "applications" +DEPENDS = "curl jpeg openssl xcb-util sqlite3 virtual/libgl libnotify gtk+ nettle" + +SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \ + file://boinc-AM_CONDITIONAL.patch \ + file://opengl_m4_check.patch \ + file://cross-compile.patch \ +" +SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" +SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" + +inherit gettext autotools-brokensep pkgconfig + +S = "${WORKDIR}/${BPN}_release-7.6-${PV}" + +EXTRA_OECONF += "\ + --enable-libraries \ + --enable-unicode \ + --enable-shared \ + --enable-dynamic-client-linkage \ + --enable-client \ + --disable-server \ + --disable-static \ + --disable-manager \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + --without-wxdir \ + --without-x \ + --with-boinc-platform=${TARGET_SYS} \ +" +export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" + +do_compile_prepend () { + # Disable rpaths + sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/${TARGET_SYS}-libtool + 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 +} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>
boinc-client-7.6.33: boinc-client rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]
Quoted 227 lines
--- .../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 19 +++++ .../boinc/boinc-client/cross-compile.patch | 92 ++++++++++++++++++++++ .../boinc/boinc-client/opengl_m4_check.patch | 13 +++ .../recipes-extended/boinc/boinc-client_7.6.33.bb | 60 ++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bbmeta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch new file +19
-0@@ -0,0 +1,19 @@ +--- A/configure.ac ++++ B/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_CXX + AC_PROG_F77 + AC_PROG_CPP ++AC_PROG_OBJCXX + AC_PROG_MAKE_SET + SAH_LINKS + AC_LANG_PUSH(C) +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) + ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++ + dnl ====================================================================== + dnl some more vodoo required for building portable client-binary (client, clientgui) + dnl ======================================================================meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch new file +92
-0@@ -0,0 +1,92 @@ +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/opengl_m4_check.patch new file +13
-0@@ -0,0 +1,13 @@ +Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +=================================================================== +--- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 ++++ boinc-client_release-7.6-7.6.33/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)meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb new file +60
-0@@ -0,0 +1,60 @@ +# Copyright (C) 2016 Khem Raj <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Open-source software for volunteer computing" +DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \ +source software platform which supports distributed computing, primarily in \ +the form of volunteer computing and desktop Grid computing. It is well \ +suited for problems which are often described as trivially parallel. BOINC \ +is the underlying software used by projects such as SETI@home, Einstein@Home, \ +ClimatePrediciton.net, the World Community Grid, and many other distributed \ +computing projects. \ +This package installs the BOINC client software, which will allow your \ +computer to participate in one or more BOINC projects, using your spare \ +computer time to search for cures for diseases, model protein folding, study \ +global warming, discover sources of gravitational waves, and many other types \ +of scientific and mathematical research." + +HOMEPAGE = "http://boinc.berkeley.edu/" +LICENSE = "LGPLv2+ & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" +SECTION = "applications" +DEPENDS = "curl jpeg openssl xcb-util sqlite3 virtual/libgl libnotify gtk+ nettle" + +SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \ + file://boinc-AM_CONDITIONAL.patch \ + file://opengl_m4_check.patch \ + file://cross-compile.patch \ +" +SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" +SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" + +inherit gettext autotools-brokensep pkgconfig + +S = "${WORKDIR}/${BPN}_release-7.6-${PV}" + +EXTRA_OECONF += "\ + --enable-libraries \ + --enable-unicode \ + --enable-shared \ + --enable-dynamic-client-linkage \ + --enable-client \ + --disable-server \ + --disable-static \ + --disable-manager \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + --without-wxdir \ + --without-x \ + --with-boinc-platform=${TARGET_SYS} \ +" +export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" + +do_compile_prepend () { + # Disable rpaths + sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/${TARGET_SYS}-libtool + 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 +} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"Signature · 7 lines
2.10.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 9 lines · Martin Jansa
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>boinc-client-7.6.33: boinc-client rdepends on libxscrnsaver, but it isn't a build dependency, missing libxscrnsaver in DEPENDS or PACKAGECONFIG? [build-deps]
thanks, drop this one for now. I will send a v2 with feedback addressed.
Quoted 236 lines
Quoted 223 lines
---
.../boinc/boinc-client/boinc-AM_CONDITIONAL.patch | 19 +++++ .../boinc/boinc-client/cross-compile.patch | 92 ++++++++++++++++++++++ .../boinc/boinc-client/opengl_m4_check.patch | 13 +++ .../recipes-extended/boinc/boinc-client_7.6.33.bb | 60 ++++++++++++++ 4 files changed, 184 insertions(+)create mode 100644
meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patchcreate mode 100644meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patchcreate mode 100644meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patchcreate mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bbmeta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch new file +19
-0@@ -0,0 +1,19 @@ +--- A/configure.ac ++++ B/configure.ac +@@ -39,6 +39,7 @@ AC_PROG_CC + AC_PROG_CXX + AC_PROG_F77 + AC_PROG_CPP ++AC_PROG_OBJCXX + AC_PROG_MAKE_SET + SAH_LINKS + AC_LANG_PUSH(C) +@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " + AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) + AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) + ++PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) ++ + dnl ====================================================================== + dnl some more vodoo required for building portable client-binary (client, clientgui) + dnl ======================================================================meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch new file +92
-0@@ -0,0 +1,92 @@ +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/opengl_m4_check.patch new file +13
-0@@ -0,0 +1,13 @@ +Index: boinc-client_release-7.6-7.6.33/m4/ax_check_gl.m4 +=================================================================== +--- boinc-client_release-7.6-7.6.33.orig/m4/ax_check_gl.m4 ++++ boinc-client_release-7.6-7.6.33/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)meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb new file +60
-1@@ -0,0 +1,60 @@ +# Copyright (C) 2016 Khem Raj <[email protected]> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Open-source software for volunteer computing" +DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \ +source software platform which supports distributed computing, primarily in \ +the form of volunteer computing and desktop Grid computing. It is well \ +suited for problems which are often described as trivially parallel. BOINC \ +is the underlying software used by projects such as SETI@home, Einstein@Home, \ +ClimatePrediciton.net, the World Community Grid, and many other distributed \ +computing projects. \ +This package installs the BOINC client software, which will allow your \ +computer to participate in one or more BOINC projects, using your spare \ +computer time to search for cures for diseases, model protein folding, study \ +global warming, discover sources of gravitational waves, and many other types \ +of scientific and mathematical research." + +HOMEPAGE = "http://boinc.berkeley.edu/" +LICENSE = "LGPLv2+ & GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" +SECTION = "applications" +DEPENDS = "curl jpeg openssl xcb-util sqlite3 virtual/libgl libnotify gtk+ nettle" + +SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.gz \ + file://boinc-AM_CONDITIONAL.patch \ + file://opengl_m4_check.patch \ + file://cross-compile.patch \ +" +SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac" +SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d" + +inherit gettext autotools-brokensep pkgconfig + +S = "${WORKDIR}/${BPN}_release-7.6-${PV}" + +EXTRA_OECONF += "\ + --enable-libraries \ + --enable-unicode \ + --enable-shared \ + --enable-dynamic-client-linkage \ + --enable-client \ + --disable-server \ + --disable-static \ + --disable-manager \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + --without-wxdir \ + --without-x \ + --with-boinc-platform=${TARGET_SYS} \ +" +export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" + +do_compile_prepend () { + # Disable rpaths + sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/${TARGET_SYS}-libtool + 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 +} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" --2.10.0
Quoted 5 lines
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
Martin 'JaMa' Jansa jabber: [email protected]
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel