075d187ee3
Cleanup patches. OBS-URL: https://build.opensuse.org/request/show/114582 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=170
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
-------------------------------------------------------------------
|
|
Wed Jun 4 14:29:07 CEST 2003 - kukuk@suse.de
|
|
|
|
- Make --no-archive default for localedef
|
|
|
|
Index: glibc-2.15/locale/programs/localedef.c
|
|
===================================================================
|
|
--- glibc-2.15.orig/locale/programs/localedef.c
|
|
+++ glibc-2.15/locale/programs/localedef.c
|
|
@@ -82,7 +82,7 @@ const char *alias_file;
|
|
static struct localedef_t *locales;
|
|
|
|
/* If true don't add locale data to archive. */
|
|
-bool no_archive;
|
|
+bool no_archive = true;
|
|
|
|
/* If true add named locales to archive. */
|
|
static bool add_to_archive;
|
|
@@ -113,6 +113,7 @@ void (*argp_program_version_hook) (FILE
|
|
#define OPT_REPLACE 307
|
|
#define OPT_DELETE_FROM_ARCHIVE 308
|
|
#define OPT_LIST_ARCHIVE 309
|
|
+#define OPT_ARCHIVE 310
|
|
|
|
/* Definitions of arguments for argp functions. */
|
|
static const struct argp_option options[] =
|
|
@@ -134,6 +135,8 @@ static const struct argp_option options[
|
|
N_("Suppress warnings and information messages") },
|
|
{ "verbose", 'v', NULL, 0, N_("Print more messages") },
|
|
{ NULL, 0, NULL, 0, N_("Archive control:") },
|
|
+ { "archive", OPT_ARCHIVE, NULL, 0,
|
|
+ N_("Add new data to archive") },
|
|
{ "no-archive", OPT_NO_ARCHIVE, NULL, 0,
|
|
N_("Don't add new data to archive") },
|
|
{ "add-to-archive", OPT_ADD_TO_ARCHIVE, NULL, 0,
|
|
@@ -314,6 +317,9 @@ parse_opt (int key, char *arg, struct ar
|
|
case OPT_PREFIX:
|
|
output_prefix = arg;
|
|
break;
|
|
+ case OPT_ARCHIVE:
|
|
+ no_archive = false;
|
|
+ break;
|
|
case OPT_NO_ARCHIVE:
|
|
no_archive = true;
|
|
break;
|