diff options
Diffstat (limited to 'meta/recipes-support/libproxy/libproxy')
-rw-r--r-- | meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/libproxy/libproxy/determinism.patch | 26 |
2 files changed, 26 insertions, 31 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch b/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch deleted file mode 100644 index fedda9dd95..0000000000 --- a/meta/recipes-support/libproxy/libproxy/0001-get-pac-test-Fix-build-with-clang-libc.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - diff --git a/meta/recipes-support/libproxy/libproxy/determinism.patch b/meta/recipes-support/libproxy/libproxy/determinism.patch new file mode 100644 index 0000000000..09770f68f0 --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy/determinism.patch @@ -0,0 +1,26 @@ +[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module + +Checking whether the host system has /etc/sysconfig is not deterministic +when cross compiling. Allow this to be disabled by adding a configure +option for it. OpenEmbedded can set this and have deterministic build +output independent of the host OS. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160] + +Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk +=================================================================== +--- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk ++++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk +@@ -1,5 +1,8 @@ + if (NOT WIN32 AND NOT APPLE) +- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") +- set(SYSCONFIG_FOUND 1) ++ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON) ++ if(WITH_SYSCONFIG) ++ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig") ++ set(SYSCONFIG_FOUND 1) ++ endif() + endif() + endif() +\ No newline at end of file |