diff options
Diffstat (limited to 'meta/recipes-support/libproxy')
4 files changed, 68 insertions, 72 deletions
diff --git a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch b/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch deleted file mode 100644 index 5ae52f2d43..0000000000 --- a/meta/recipes-support/libproxy/libproxy/0001-test-Include-sys-select.h-for-select.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5f2c2289eb35eb804c1c35e46ca41b58e4cae01 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Apr 2015 14:13:49 -0700 -Subject: [PATCH] test: Include <sys/select.h> for select() - -As per posix we need to include this file otherwise we end up with errors like - -/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp: In member function 'bool TestServer::loop()': -/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp:80:4: error: 'fd_set' was not declared in this scope - fd_set fds; - ^ -/home/kraj/work/bleeding/openembedded-core/build/tmp-musl/work/mips32r2-oe-linux-musl/libproxy/0.4.11-r0/libproxy-0.4.11/libproxy/test/get-pac-test.cpp:89:14: error: 'fds' was not declared in this scope - FD_ZERO (&fds); -<JIRA TICKET #1>, <JIRA TICKET #2>, <JIRA TICKET #n> : <one line summary of change> - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libproxy/test/get-pac-test.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libproxy/test/get-pac-test.cpp b/libproxy/test/get-pac-test.cpp -index a61fc4b..bda4646 100644 ---- a/libproxy/test/get-pac-test.cpp -+++ b/libproxy/test/get-pac-test.cpp -@@ -3,6 +3,7 @@ - #include <sstream> - #include <string> - -+#include <sys/select.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> --- -2.1.4 - 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 diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb deleted file mode 100644 index 06d0b9ba9d..0000000000 --- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Library providing automatic proxy configuration management" -HOMEPAGE = "http://code.google.com/p/libproxy/" -BUGTRACKER = "http://code.google.com/p/libproxy/issues/list" -SECTION = "libs" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" - -DEPENDS = "gconf glib-2.0" - -SRC_URI = "${DEBIAN_MIRROR}/main/libp/${BPN}/${BPN}_${PV}.orig.tar.gz \ - file://0001-test-Include-sys-select.h-for-select.patch \ - " -SRC_URI[md5sum] = "3cd1ae2a4abecf44b3f24d6639d2cd84" -SRC_URI[sha256sum] = "dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ - -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir} -DLIBEXEC_INSTALL_DIR=${libexecdir}" - -FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" -FILES_${PN}-dev += "${datadir}/cmake" -FILES_${PN}-dbg += "${libdir}/${BPN}/${PV}/plugins/.debug/ ${libdir}/${BPN}/${PV}/modules/.debug/" - -do_configure_prepend() { - export HOST_SYS=${HOST_SYS} - export BUILD_SYS=${BUILD_SYS} -} - -python() { - if incompatible_license_contains("GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "": - d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE", False).replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) - d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS", False).split() if i != "gconf")) -} diff --git a/meta/recipes-support/libproxy/libproxy_0.4.17.bb b/meta/recipes-support/libproxy/libproxy_0.4.17.bb new file mode 100644 index 0000000000..e121681ae8 --- /dev/null +++ b/meta/recipes-support/libproxy/libproxy_0.4.17.bb @@ -0,0 +1,42 @@ +SUMMARY = "Library providing automatic proxy configuration management" +DESCRIPTION = "libproxy provides interfaces to get the proxy that will be \ +used to access network resources. It uses various plugins to get proxy \ +configuration via different mechanisms (e.g. environment variables or \ +desktop settings)." +HOMEPAGE = "https://github.com/libproxy/libproxy" +BUGTRACKER = "https://github.com/libproxy/libproxy/issues" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" + +DEPENDS = "glib-2.0" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://determinism.patch" +SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" + +UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" +UPSTREAM_CHECK_REGEX = "libproxy-(?P<pver>.*)\.tar" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gnome', '', d)} gnome3" +PACKAGECONFIG[gnome] = "-DWITH_GNOME=yes,-DWITH_GNOME=no,gconf" +PACKAGECONFIG[gnome3] = "-DWITH_GNOME3=yes,-DWITH_GNOME3=no" + +EXTRA_OECMAKE += " \ + -DWITH_KDE=no \ + -DWITH_MOZJS=no \ + -DWITH_NM=no \ + -DWITH_PERL=no \ + -DWITH_PYTHON2=no \ + -DWITH_PYTHON3=no \ + -DWITH_WEBKIT=no \ + -DWITH_SYSCONFIG=no \ + -DLIB_INSTALL_DIR=${libdir} \ + -DLIBEXEC_INSTALL_DIR=${libexecdir} \ +" +SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" + +FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" |