summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 14:46:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-23 22:35:01 +0000
commitb28a214f2e2eb1dfc64f1906703ab4b59d0df546 (patch)
treee62581bba542f47f1444c8347c1b73b7801a32b7 /meta
parent555d09870681ca4e3b4e1c3c7a3ff288c550845f (diff)
downloadpoky-b28a214f2e2eb1dfc64f1906703ab4b59d0df546.tar.gz
libproxy: Avoid /etc/sysconfig determinism issue
(From OE-Core rev: bf004ccd77b2ac49bec69aa0507efee694f57c37) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libproxy/libproxy/determinism.patch26
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.17.bb4
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 @@
1[PATCH] cmake/modules/config_sysconfig: Allow configuration of sysconfig module
2
3Checking whether the host system has /etc/sysconfig is not deterministic
4when cross compiling. Allow this to be disabled by adding a configure
5option for it. OpenEmbedded can set this and have deterministic build
6output independent of the host OS.
7
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9Upstream-Status: Submitted [https://github.com/libproxy/libproxy/pull/160]
10
11Index: libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk
12===================================================================
13--- libproxy-0.4.17.orig/libproxy/cmake/modules/config_sysconfig.cmk
14+++ libproxy-0.4.17/libproxy/cmake/modules/config_sysconfig.cmk
15@@ -1,5 +1,8 @@
16 if (NOT WIN32 AND NOT APPLE)
17- if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig")
18- set(SYSCONFIG_FOUND 1)
19+ option(WITH_SYSCONFIG "Build sysconfig module for /etc/sysconfig" ON)
20+ if(WITH_SYSCONFIG)
21+ if (EXISTS "/etc/sysconfig" AND IS_DIRECTORY "/etc/sysconfig")
22+ set(SYSCONFIG_FOUND 1)
23+ endif()
24 endif()
25 endif()
26\ 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 \
8 8
9DEPENDS = "glib-2.0" 9DEPENDS = "glib-2.0"
10 10
11SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" 11SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
12 file://determinism.patch"
12SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05" 13SRC_URI[sha256sum] = "bc89f842f654ee1985a31c0ba56dc7e2ce8044a0264ddca84e650f46cd7f8b05"
13 14
14UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases" 15UPSTREAM_CHECK_URI = "https://github.com/libproxy/libproxy/releases"
@@ -28,6 +29,7 @@ EXTRA_OECMAKE += " \
28 -DWITH_PYTHON2=no \ 29 -DWITH_PYTHON2=no \
29 -DWITH_PYTHON3=no \ 30 -DWITH_PYTHON3=no \
30 -DWITH_WEBKIT=no \ 31 -DWITH_WEBKIT=no \
32 -DWITH_SYSCONFIG=no \
31 -DLIB_INSTALL_DIR=${libdir} \ 33 -DLIB_INSTALL_DIR=${libdir} \
32 -DLIBEXEC_INSTALL_DIR=${libexecdir} \ 34 -DLIBEXEC_INSTALL_DIR=${libexecdir} \
33" 35"