[oe-commits] [meta-openembedded] 19/32: net-snmp: Reproducibility: Don't check build host for /etc/printcap

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 374bfe0cc6fcb703a1594f5cd308442cd637d007
Author: douglas.royds <douglas.royds at taitradio.com>
AuthorDate: Wed Nov 21 13:52:18 2018 +1300

    net-snmp: Reproducibility: Don't check build host for /etc/printcap
    
    Don't check for /etc/printcap on the build machine when cross-compiling.
    Use AC_CHECK_FILE to set the cached variable ac_cv_file__etc_printcap instead.
    When cross-compiling, this variable should be set in the environment to "yes" or
    "no" as appropriate for the target platform.
    
    I have taken the simple expedient of setting ac_cv_file__etc_printcap=no.
    If this proves to be a problem, we can easily add a new variable, HAS_PRINTCAP.
    
    Upstream-Status: Submitted https://sourceforge.net/p/net-snmp/patches/1385/
    Signed-off-by: Douglas Royds <douglas.royds at taitradio.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../net-snmp/reproducibility-have-printcap.patch      | 19 +++++++++++++++++++
 .../recipes-protocols/net-snmp/net-snmp_5.8.bb        |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
new file mode 100644
index 0000000..4316c7a
--- /dev/null
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/reproducibility-have-printcap.patch
@@ -0,0 +1,19 @@
+Reproducible build: Don't check for /etc/printcap on the build machine when
+cross-compiling. Use AC_CHECK_FILE to set the cached variable
+ac_cv_file__etc_printcap instead. When cross-compiling, this variable should be
+set in the environment to "yes" or "no" as appropriate for the target platform.
+
+--- net-snmp-5.8.original/configure.d/config_os_misc4	2018-11-20 17:05:03.986274522 +1300
++++ net-snmp-5.8/configure.d/config_os_misc4	2018-11-20 17:08:32.250700448 +1300
+@@ -116,9 +116,9 @@
+ 	[Path to the lpstat command])
+     AC_DEFINE(HAVE_LPSTAT, 1, [Set if the lpstat command is available])
+ fi
+-if test -r /etc/printcap; then
++AC_CHECK_FILE([/etc/printcap],
+     AC_DEFINE(HAVE_PRINTCAP, 1, [Set if /etc/printcap exists])
+-fi
++)
+ 
+ 
+ #       Check ps args
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
index 03fe24b..f556c58 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
@@ -24,6 +24,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \
            file://0004-configure-fix-incorrect-variable.patch \
            file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \
            file://net-snmp-fix-for-disable-des.patch \
+           file://reproducibility-have-printcap.patch \
            "
 SRC_URI[md5sum] = "6aae5948df7efde626613d6a4b3cd9d4"
 SRC_URI[sha256sum] = "c6291385b8ed84f05890fe4197005daf7e7ee7b082c2e390fa114a9477a56042"
@@ -68,6 +69,7 @@ CACHED_CONFIGUREVARS = " \
     ac_cv_ETC_MNTTAB=/etc/mtab \
     lt_cv_shlibpath_overrides_runpath=yes \
     ac_cv_path_UNAMEPROG=${base_bindir}/uname \
+    ac_cv_file__etc_printcap=no \
 "
 export PERLPROG="${bindir}/env perl"
 PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.