diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 14:46:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-23 22:31:26 +0000 |
| commit | bf004ccd77b2ac49bec69aa0507efee694f57c37 (patch) | |
| tree | edbbed189b7d1a4e49bf715d08ff0c93c90dce47 /meta | |
| parent | 0d4fa837bb55be799132cae84f0efb0bfbabd9e2 (diff) | |
| download | openembedded-core-contrib-bf004ccd77b2ac49bec69aa0507efee694f57c37.tar.gz | |
libproxy: Avoid /etc/sysconfig determinism issue
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/libproxy/libproxy/determinism.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-support/libproxy/libproxy_0.4.17.bb | 4 |
2 files changed, 29 insertions, 1 deletions
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.17.bb b/meta/recipes-support/libproxy/libproxy_0.4.17.bb index ad81cccf52..7d61861824 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.17.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.17.bb @@ -8,7 +8,8 @@ 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://determinism.patch" SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" @@ -28,6 +29,7 @@ EXTRA_OECMAKE += " \ -DWITH_PYTHON2=no \ -DWITH_PYTHON3=no \ -DWITH_WEBKIT=no \ + -DWITH_SYSCONFIG=no \ -DLIB_INSTALL_DIR=${libdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \ " |