[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Wed, 22 Nov 2023 16:10:33 -0500 (EST) |
branch: master
commit 66595c6bf610bf018806904375c234c958b26100
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Nov 22 21:51:46 2023 +0100
* tp/maintain/setup_converters_code_tables.pl: set ENV{'TEXINFO_XS'} =
'omit' to avoid depending on XS code being loaded.
---
ChangeLog | 7 ++++++-
tp/maintain/setup_converters_code_tables.pl | 8 +++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c693739a8a..b70a684f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,10 +11,15 @@
configure.ac and propagate to Makefile.am, so it is more clear what
"archlibexp" and "privlibexp" from the Perl conf are being used for.
+2023-11-22 Patrice Dumas <pertusus@free.fr>
+
+ * tp/maintain/setup_converters_code_tables.pl: set ENV{'TEXINFO_XS'} =
+ 'omit' to avoid depending on XS code being loaded.
+
2023-11-22 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/convert_html.c
- (html_get_css_elements_classes): free selctors.
+ (html_get_css_elements_classes): free selectors.
* tp/Texinfo/XS/convert/convert_html.c (html_finalize_output_state),
tp/Texinfo/XS/main/converter_types.h (CSS_LIST, CSS_SELECTOR_STYLE):
diff --git a/tp/maintain/setup_converters_code_tables.pl
b/tp/maintain/setup_converters_code_tables.pl
index 167cb13473..e1b9971cd8 100755
--- a/tp/maintain/setup_converters_code_tables.pl
+++ b/tp/maintain/setup_converters_code_tables.pl
@@ -1,4 +1,6 @@
#! /usr/bin/env perl
+# setup_converters_code_tables.pl: use perl data, mainly manually
+# generated hashes, to generate corresponding C data.
# Copyright 2023 Free Software Foundation, Inc.
#
@@ -26,8 +28,13 @@ use File::Spec;
# for dirname and fileparse
use File::Basename;
+use Encode;
+
BEGIN
{
+ # do not load XS code, to avoid both depending on and generating
+ # XS code. Also we do not want to have to find XS object files.
+ $ENV{'TEXINFO_XS'} = 'omit';
# NOTE we do not use Texinfo::ModulePath as it may not have been
# created yet, as tp/Texinfo/XS may be processed before tp.
# Also we have less modules to find, only pure perl code.
@@ -288,7 +295,6 @@ print TEXT "};\n\n";
close(TEXT);
-# Finish by this file as it is used as make target
open (NORM, '>', $normalization_file) or die "Open $normalization_file: $!\n";
print NORM "char * command_normalization_text[] = {\n";