mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

mc: Fix build reproducibility

Browse Source 
Fixes some issues with reproducible builds. Adds a patch to allow the
configure arguments to be omitted from the build and also explicitly
setting some autoconf paths that were picking up hosttools.

(From OE-Core rev: f54d60ee8f15229aa515e168b9c7d248663b48fe)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2019-11-12 22:10:31 -06:00
committed by Richard Purdie
parent e9a9fac8c6
commit fe8c75f72e
2 changed files with 103 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
meta/recipes-extended/mc/files/0001-Add-option-to-control-configure-args.patch Normal file
View File

@@ -0,0 +1,99 @@
From a54501d3c9541bc8600225aa2d42531f93c6def7 Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Sat, 9 Nov 2019 20:01:48 -0600
Subject: [PATCH] Add option to control configure args
Embedding the configure time options into the executable can lead to
non-reproducible builds, since configure options often have embedded
paths. Add a configure time option to control if the configure args are
embedded so this can be disabled.
Upstream-Status: Submitted [https://midnight-commander.org/ticket/4031]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
configure.ac | 6 ++++++
src/args.c | 6 ++++++
src/textconf.c | 2 ++
3 files changed, 14 insertions(+)
diff --git a/configure.ac b/configure.ac
index 19d1a76be..a1948f6b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,6 +544,12 @@ dnl Clarify do we really need GModule
AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \
test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"])
+AC_ARG_ENABLE([configure-args],
+ AS_HELP_STRING([--enable-configure-args], [Handle all compiler warnings as errors]))
+if test "x$enable_configure_args" != xno; then
+ AC_DEFINE([ENABLE_CONFIGURE_ARGS], 1, [Define to enable showing configure arguments in help])
+fi
+
AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments])
AC_CONFIG_FILES(
diff --git a/src/args.c b/src/args.c
index baef1a1c8..f8dc24020 100644
--- a/src/args.c
+++ b/src/args.c
@@ -95,7 +95,9 @@ static gboolean mc_args__nouse_subshell = FALSE;
#endif /* ENABLE_SUBSHELL */
static gboolean mc_args__show_datadirs = FALSE;
static gboolean mc_args__show_datadirs_extended = FALSE;
+#ifdef ENABLE_CONFIGURE_ARGS
static gboolean mc_args__show_configure_opts = FALSE;
+#endif
static GOptionGroup *main_group;
@@ -125,6 +127,7 @@ static const GOptionEntry argument_main_table[] = {
NULL
},
+#ifdef ENABLE_CONFIGURE_ARGS
/* show configure options */
{
"configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE,
@@ -132,6 +135,7 @@ static const GOptionEntry argument_main_table[] = {
N_("Print configure options"),
NULL
},
+#endif
{
"printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
@@ -758,11 +762,13 @@ mc_args_show_info (void)
return FALSE;
}
+#ifdef ENABLE_CONFIGURE_ARGS
if (mc_args__show_configure_opts)
{
show_configure_options ();
return FALSE;
}
+#endif
return TRUE;
}
diff --git a/src/textconf.c b/src/textconf.c
index 1e0613e58..f39b9e028 100644
--- a/src/textconf.c
+++ b/src/textconf.c
@@ -232,10 +232,12 @@ show_datadirs_extended (void)
/* --------------------------------------------------------------------------------------------- */
+#ifdef ENABLE_CONFIGURE_ARGS
void
show_configure_options (void)
{
(void) printf ("%s\n", MC_CONFIGURE_ARGS);
}
+#endif
/* --------------------------------------------------------------------------------------------- */
--
2.23.0

5
meta/recipes-extended/mc/mc_4.8.23.bb
View File

@@ -8,6 +8,7 @@ RDEPENDS_${PN} = "ncurses-terminfo"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
file://0001-mc-replace-perl-w-with-use-warnings.patch \
file://0001-Add-option-to-control-configure-args.patch \
"
SRC_URI[md5sum] = "152927ac29cf0e61d7d019f261bb7d89"
SRC_URI[sha256sum] = "238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d"
@@ -21,9 +22,11 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba,"
PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2,"
EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x"
EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --disable-configure-args"
CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
CACHED_CONFIGUREVARS += "ac_cv_path_PYTHON='/usr/bin/env python'"
CACHED_CONFIGUREVARS += "ac_cv_path_GREP='/usr/bin/env grep'"
do_install_append () {
sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*