Ticket #4032: 0002-Remove-configure-args-option.patch

File 0002-Remove-configure-args-option.patch, 4.3 KB (added by jpew, 4 years ago)

Remove --configure-args option

  • configure.ac 

    From 95d2e7bb87526157ec703c0d48bd8b311d16697f Mon Sep 17 00:00:00 2001
From: Joshua Watt <JPEWhacker@gmail.com>
Date: Tue, 12 Nov 2019 08:54:23 -0600
Subject: [PATCH 2/3] Remove --configure-args option

The --configure-args option isn't really required because the
information it was intended to report can be found more readily with `mc
-F`. Additionally, embedding the configure arguments can lead to
non-reproducible builds, particularly when cross-compiling as it
embeds paths into the executable.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 configure.ac       |  2 --
 doc/man/es/mc.1.in |  3 ---
 doc/man/mc.1.in    |  3 ---
 doc/man/ru/mc.1.in |  3 ---
 src/args.c         | 15 ---------------
 src/textconf.c     |  7 -------
 src/textconf.h     |  1 -
 7 files changed, 34 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6abe53100..d9028bc9a 100644
    a b dnl Clarify do we really need GModule 
    546546AM_CONDITIONAL([HAVE_GMODULE], [test -n "$g_module_supported" && \ 
    547547                                test x"$textmode_x11_support" = x"yes" -o x"$enable_aspell" = x"yes"]) 
    548548 
    549 AC_DEFINE_UNQUOTED([MC_CONFIGURE_ARGS], ["$ac_configure_args"], [MC configure arguments]) 
    550  
    551549AC_CONFIG_FILES( 
    552550[ 
    553551src/man2hlp/man2hlp 

  • doc/man/es/mc.1.in 

    diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in
index 68644ceb5..28dbec7e1 100644
    a b Usado para especificar un juego de colores diferentes desde la línea de 
    4848Colores\&.  
    4949.\"Colors" 
    5050.TP 
    51 .I \-\-configure\-options 
    52 Muestra opciones de configuración compiladas. 
    53 .TP 
    5451.I \-d, \-\-nomouse 
    5552Deshabilita el soporte de ratón. 
    5653.TP 

  • doc/man/mc.1.in 

    diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in
index cfc34e0ab..2b301503b 100644
    a b Colors 
    3737.\"Colors" 
    3838section. 
    3939.TP 
    40 .I \-\-configure\-options 
    41 Display configure options. 
    42 .TP 
    4340.I \-d, \-\-nomouse 
    4441Disable mouse support. 
    4542.TP 

  • doc/man/ru/mc.1.in 

    diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
index 547b8fdfb..309c0648c 100644
    a b UNIX\-подобных операционных системах. 
    4141Цвета\&. 
    4242.\"Colors" 
    4343.TP 
    44 .I \-\-configure\-options 
    45 Выводит опции конфигурирования, с которыми был собран  Midnight Commander. 
    46 .TP 
    4744.I \-d, \-\-nomouse 
    4845Отключает поддержку мыши. 
    4946.TP 

  • src/args.c 

    diff --git a/src/args.c b/src/args.c
index baef1a1c8..52f478c59 100644
    a b static gboolean mc_args__nouse_subshell = FALSE; 
    9595#endif /* ENABLE_SUBSHELL */ 
    9696static gboolean mc_args__show_datadirs = FALSE; 
    9797static gboolean mc_args__show_datadirs_extended = FALSE; 
    98 static gboolean mc_args__show_configure_opts = FALSE; 
    9998 
    10099static GOptionGroup *main_group; 
    101100 
    … … static const GOptionEntry argument_main_table[] = { 
    125124     NULL 
    126125    }, 
    127126 
    128     /* show configure options */ 
    129     { 
    130      "configure-options", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, 
    131      &mc_args__show_configure_opts, 
    132      N_("Print configure options"), 
    133      NULL 
    134     }, 
    135  
    136127    { 
    137128     "printwd", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, 
    138129     &mc_args__last_wd_file, 
    … … mc_args_show_info (void) 
    758749        return FALSE; 
    759750    } 
    760751 
    761     if (mc_args__show_configure_opts) 
    762     { 
    763         show_configure_options (); 
    764         return FALSE; 
    765     } 
    766  
    767752    return TRUE; 
    768753} 
    769754 

  • src/textconf.c 

    diff --git a/src/textconf.c b/src/textconf.c
index 1e0613e58..82e238f82 100644
    a b show_datadirs_extended (void) 
    232232 
    233233/* --------------------------------------------------------------------------------------------- */ 
    234234 
    235 void 
    236 show_configure_options (void) 
    237 { 
    238     (void) printf ("%s\n", MC_CONFIGURE_ARGS); 
    239 } 
    240  
    241 /* --------------------------------------------------------------------------------------------- */ 

  • src/textconf.h 

    diff --git a/src/textconf.h b/src/textconf.h
index 9e039ae14..616dc12e2 100644
    a b  
    1717 
    1818extern void show_version (void); 
    1919extern void show_datadirs_extended (void); 
    20 extern void show_configure_options (void); 
    2120 
    2221/*** inline functions ****************************************************************************/ 
    2322#endif /* MC__TEXTCONF_H */