diff mbox series

[oe,meta-oe,2/8] mosh: Upgrade to 1.3.2

Message ID 20190130052911.36336-2-raj.khem@gmail.com
State Accepted
Commit 21e3bb57ff6fbe5142ad5920430fe02951e343fc
Headers show
Series [oe,meta-oe,1/8] cpuburn-arm: Move cpuburn-neon to cpuburn-arm and add more tests | expand

Commit Message

Khem Raj Jan. 30, 2019, 5:29 a.m. UTC 
Fix building with clang/libc++ while here

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../mosh/0001-Fix-building-with-libc.patch    | 24 +++++++++++++++++++
 .../mosh/{mosh_1.3.0.bb => mosh_1.3.2.bb}     |  8 ++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
 rename meta-oe/recipes-connectivity/mosh/{mosh_1.3.0.bb => mosh_1.3.2.bb} (87%)

-- 
2.20.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
new file mode 100644
index 0000000000..100ede17bd
--- /dev/null
+++ b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch
@@ -0,0 +1,24 @@ 
+From efa9e49714b30d7d9128946a2504c93e10d109b5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 29 Jan 2019 12:20:03 -0800
+Subject: [PATCH] Fix building with libc++
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/network/network.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/network.cc b/src/network/network.cc
+index 26da603..e480853 100644
+--- a/src/network/network.cc
++++ b/src/network/network.cc
+@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high )
+       }
+     }
+ 
+-    if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
++    if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
+       set_MTU( local_addr.sa.sa_family );
+       return true;
+     } else if ( i == search_high ) { /* last port to search */
diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb
similarity index 87%
rename from meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb
rename to meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb
index 9fc8435ee6..9c439354d1 100644
--- a/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb
+++ b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb
@@ -14,9 +14,11 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter"
 
-SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz"
-SRC_URI[md5sum] = "d961276995936953bf2d5a794068b076"
-SRC_URI[sha256sum] = "320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376"
+SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \
+           file://0001-Fix-building-with-libc.patch \
+           "
+SRC_URI[md5sum] = "5122f4d2b973ab7c38dcdac8c35cb61e"
+SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216"
 
 inherit autotools pkgconfig