Skip to contentSkip to conversation

mraa: Fix build on musl

PATCH New Khem Raj 1 participant 6 messages Apr 16, 2018 RISC-V

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/6 mraa: Fix build on musl

---
 ...-for-be16toh-and-le16toh-declaration.patch | 27 +++++++++++++++++++
 meta-oe/recipes-extended/mraa/mraa_git.bb     |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch
meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch new file +27 -0
new file mode 100644
index 000000000..711738a92
@@ -0,0 +1,27 @@
+From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 5 Feb 2018 09:51:08 -0800
+Subject: [PATCH] include endian.h for be16toh and le16toh declarations
+
+Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863]
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ examples/iio_driver.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/iio_driver.c b/examples/iio_driver.c
+index c5a0181..568011c 100644
+--- a/examples/iio_driver.c
++++ b/examples/iio_driver.c
+@@ -22,6 +22,7 @@
+  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
++#include <endian.h>
+ #include <unistd.h>
+ #include "mraa/iio.h"
+ 
+-- 
+2.16.1
+
meta-oe/recipes-extended/mraa/mraa_git.bb +3 -1
index 16883be3a..366d6b70f 100644
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b92a3b497d7943042a6db40c088c3f2"
 SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb"
 PV = "1.9.0-git${SRCPV}"
 
-SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http"
+SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
+           file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \
+           "
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/6 mraa: Drop residual patch

This patch is already applied upstream see
https://github.com/intel-iot-devkit/mraa/commit/c9566bdc6ff706f80140396a9980eba3d6bd52a1

---
 ...-for-be16toh-and-le16toh-declaration.patch | 27 -------------------
 meta-oe/recipes-extended/mraa/mraa_git.bb     |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch
meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch deleted +0 -27
deleted file mode 100644
index 711738a92..000000000
@@ -1,27 +0,0 @@
-From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 5 Feb 2018 09:51:08 -0800
-Subject: [PATCH] include endian.h for be16toh and le16toh declarations
-
-Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863]
-
-Signed-off-by: Khem Raj <[email protected]>
----
- examples/iio_driver.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/iio_driver.c b/examples/iio_driver.c
-index c5a0181..568011c 100644
---- a/examples/iio_driver.c
-+++ b/examples/iio_driver.c
-@@ -22,6 +22,7 @@
-  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <endian.h>
- #include <unistd.h>
- #include "mraa/iio.h"
- 
--- 
-2.16.1
-
meta-oe/recipes-extended/mraa/mraa_git.bb +0 -1
index 366d6b70f..930c04123 100644
@@ -9,7 +9,6 @@ SRCREV = "fbb7d9232067eac3f4508a37a8f7ea0c4fcebacb"
 PV = "1.9.0-git${SRCPV}"
 
 SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
-           file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.17.0
author
#2 lore raw

PATCH 3/6 site: Add riscv64 specific cache

In reply to Khem Raj
---
 meta-gnome/site/riscv64-linux | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-gnome/site/riscv64-linux
meta-gnome/site/riscv64-linux new file +16 -0
new file mode 100644
index 000000000..e3a41ea0e
@@ -0,0 +1,16 @@
+# libidl
+libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
+
+# ORBit2
+ac_cv_alignof_CORBA_boolean=1
+ac_cv_alignof_CORBA_char=1
+ac_cv_alignof_CORBA_double=8
+ac_cv_alignof_CORBA_float=4
+ac_cv_alignof_CORBA_long=4
+ac_cv_alignof_CORBA_long_double=8
+ac_cv_alignof_CORBA_long_long=8
+ac_cv_alignof_CORBA_octet=1
+ac_cv_alignof_CORBA_pointer=4
+ac_cv_alignof_CORBA_short=2
+ac_cv_alignof_CORBA_struct=1
+ac_cv_alignof_CORBA_wchar=2
Signature · 1 line
2.17.0
author
#3 lore raw

PATCH 4/6 ctdb: Call gnu-configize for getting new config.* files

In reply to Khem Raj

Architecture support for riscv64 needs new config.guess

---
 meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 1 +
 1 file changed, 1 insertion(+)
meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +1 -0
index b5a60645c..2ca781bf5 100644
@@ -35,6 +35,7 @@ LDFLAGS_append_libc-musl = " -ltirpc"
 RDEPENDS_${PN} += "procps"
 
 do_configure() {
+    gnu-configize --force ${S}
     oe_runconf
 }
 
Signature · 1 line
2.17.0
author
#4 lore raw

PATCH 5/6 libyui: Fix build with gcc8

In reply to Khem Raj
---
 .../libyui/0001-Fix-GCC-8-warning.patch       | 48 +++++++++++++++++++
 meta-oe/recipes-graphics/libyui/libyui_git.bb |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch
meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch new file +48 -0
new file mode 100644
index 000000000..c1ba42eee
@@ -0,0 +1,48 @@
+From 1e6d40fec16a94d1a4bd40634405267200b7e969 Mon Sep 17 00:00:00 2001
+From: marxin <[email protected]>
+Date: Tue, 10 Apr 2018 15:21:40 +0200
+Subject: [PATCH] Fix GCC 8 warning:
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static void YDialog::showText(const string&, bool)’:
+/home/marxin/Programming/libyui/src/YDialog.cc:690:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=]
+     catch ( YUIException exception )
+                          ^~~~~~~~~
+/home/marxin/Programming/libyui/src/YDialog.cc: In static member function ‘static bool YDialog::showRelNotesText()’:
+/home/marxin/Programming/libyui/src/YDialog.cc:814:26: error: catching polymorphic type ‘class YUIException’ by value [-Werror=catch-value=]
+     catch ( YUIException exception )
+                          ^~~~~~~~~
+---
+Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/122]
+Signed-off-by: Khem Raj <[email protected]>
+
+ src/YDialog.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/YDialog.cc b/src/YDialog.cc
+index 92e5031..8ecff90 100644
+--- a/src/YDialog.cc
++++ b/src/YDialog.cc
+@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText )
+ 	dialog->waitForEvent();
+ 	dialog->destroy();
+     }
+-    catch ( YUIException exception )
++    catch ( YUIException &exception )
+     {
+ 	// Don't let the application die just because help couldn't be displayed.
+ 
+@@ -811,7 +811,7 @@ YDialog::showRelNotesText()
+ 	}
+         dialog->destroy();
+     }
+-    catch ( YUIException exception )
++    catch ( YUIException &exception )
+     {
+         // Don't let the application die just because RN couldn't be displayed.
+ 
+-- 
+2.17.0
+
meta-oe/recipes-graphics/libyui/libyui_git.bb +1 -0
index 92d96044e..e46e365b2 100644
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
                    "
 
 SRC_URI = "git://github.com/libyui/libyui.git \
+           file://0001-Fix-GCC-8-warning.patch \
            "
 
 PV = "3.3.3+git"
Signature · 1 line
2.17.0
author
#5 lore raw

PATCH 6/6 xdebug: Add missing dep on re2c-native

In reply to Khem Raj
---
 meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb +1 -1
index 2b8943d22..6516988d7 100644
@@ -2,7 +2,7 @@ SUMMARY = "Debugging and profiling extension for PHP"
 LICENSE = "Xdebug"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16"
 
-DEPENDS = "php"
+DEPENDS = "php re2c-native"
 
 SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz"
 
Signature · 1 line
2.17.0