mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

libproxy: Fix build with clang/libc++

Browse Source 
(From OE-Core rev: 3f61b8e612a1506af289a3dafb5f2706531e6bf5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2019-01-30 22:50:13 -08:00
committed by Richard Purdie
parent c38a24f620
commit df12337a31
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch Normal file
View File

@@ -0,0 +1,31 @@
From 2d73469c7a17ebfe4330ac6643b0c8abdc125d05 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 30 Jan 2019 09:29:44 -0800
Subject: [PATCH] get-pac-test: Fix build with clang/libc++
get-pac-test.cpp:55:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *, unsigned int>'
ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/97]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libproxy/test/get-pac-test.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp
index 0059dfb..911f296 100644
--- a/libproxy/test/get-pac-test.cpp
+++ b/libproxy/test/get-pac-test.cpp
@@ -52,7 +52,7 @@ class TestServer {
setsockopt(m_sock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
- ret = bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
+ ret = ::bind(m_sock, (sockaddr*)&addr, sizeof (struct sockaddr_in));
assert(!ret);
ret = listen(m_sock, 1);
--
2.20.1

4
meta/recipes-support/libproxy/libproxy_0.4.15.bb
View File

@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
DEPENDS = "glib-2.0"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
file://0001-get-pac-test-Fix-build-with-clang-libc.patch \
"
SRC_URI[md5sum] = "f6b1d2a1e17a99cd3debaae6d04ab152"
SRC_URI[sha256sum] = "654db464120c9534654590b6683c7fa3887b3dad0ca1c4cd412af24fbfca6d4f"