[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS), tp
From: |
Patrice Dumas |
Subject: |
branch master updated: * tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS), tp/Texinfo/XS/configure.ac (PACKAGE_PERL_NUMERICAL_VERSION) (XS_VERSION), tp/Texinfo/XSLoader.pm ($numerical_version, init): setup numerical versions for XS_VERSION in configure.ac and compare numerical version in XSLoader.pm to compare numerical through bootstrap. |
Date: |
Sat, 05 Oct 2024 11:32:18 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 5ccfa504ad * tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS),
tp/Texinfo/XS/configure.ac (PACKAGE_PERL_NUMERICAL_VERSION) (XS_VERSION),
tp/Texinfo/XSLoader.pm ($numerical_version, init): setup numerical versions for
XS_VERSION in configure.ac and compare numerical version in XSLoader.pm to
compare numerical through bootstrap.
5ccfa504ad is described below
commit 5ccfa504ad7c06ddcf26d8c03cf824fb74e74ca2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 5 17:32:23 2024 +0200
* tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS),
tp/Texinfo/XS/configure.ac (PACKAGE_PERL_NUMERICAL_VERSION)
(XS_VERSION), tp/Texinfo/XSLoader.pm ($numerical_version, init):
setup numerical versions for XS_VERSION in configure.ac and compare
numerical version in XSLoader.pm to compare numerical through
bootstrap.
---
ChangeLog | 17 +++++++++++++----
tp/Texinfo/XS/Makefile.am | 2 +-
tp/Texinfo/XS/configure.ac | 4 ++++
tp/Texinfo/XSLoader.pm | 9 ++++++++-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6bb522fa1e..2122247bd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-10-05 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS),
+ tp/Texinfo/XS/configure.ac (PACKAGE_PERL_NUMERICAL_VERSION)
+ (XS_VERSION), tp/Texinfo/XSLoader.pm ($numerical_version, init):
+ setup numerical versions for XS_VERSION in configure.ac and compare
+ numerical version in XSLoader.pm to compare numerical through
+ bootstrap.
+
+2024-10-05 Patrice Dumas <pertusus@free.fr>
+
+ TODO: remove more mixing of direct processing and libraries
+
2024-10-05 Gavin Smith <gavinsmith0123@gmail.com>
Fix translated strings for definition lines beginning @tie{}--
@@ -7,10 +20,6 @@
these strings have changed in the program and the translations
wouldn't be used otherwise.
-2024-10-05 Patrice Dumas <pertusus@free.fr>
-
- TODO: remove more mixing of direct processing and libraries
-
2024-10-05 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/convert/html_prepare_converter.c
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 2f2643600b..7027410a69 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -46,7 +46,7 @@ xsdir = $(pkglibdir)
# XS_VERSION is used in version check in the bootstrap function created
# by xsubpp in C code generated from .xs, and called in XSLoader.pm
-XSLIBS_CPPFLAGS = -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(VERSION)\"
+XSLIBS_CPPFLAGS = -DVERSION=\"$(VERSION)\" -DXS_VERSION=\"$(XS_VERSION)\"
XSLIBS_CPPFLAGS += -I$(PERL_INC)
XSLIBS_CFLAGS = $(perl_conf_CFLAGS)
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 58aa7ad883..f66a0f2585 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -83,6 +83,7 @@ perl_conf_CFLAGS=
perl_conf_LDFLAGS=
XSUBPPARGS=
PERL_INC=
+PACKAGE_PERL_NUMERICAL_VERSION=0
# See (automake)Conditional Subdirectories. Even if --disable-perl-xs
# is given, we still need to configure this directory minimally, so that
@@ -90,6 +91,8 @@ PERL_INC=
if test x$disable_xs != xyes; then
AC_PATH_PROG([PERL], [perl])
+ PACKAGE_PERL_NUMERICAL_VERSION=`${PERL} -e 'use version; print
version->declare('"$PACKAGE_VERSION"')->numify;'`
+
if test -n "$PERL_EXT_CC" ; then
CC=$PERL_EXT_CC
else
@@ -139,6 +142,7 @@ fi # not disable_xs
AC_SUBST([PERL_INC], [$PERL_INC])
AC_SUBST([XSUBPPARGS], [$XSUBPPARGS])
+AC_SUBST([XS_VERSION], [$PACKAGE_PERL_NUMERICAL_VERSION])
AC_PROG_CC
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 45bbb5c0a1..b05ad0baf7 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -21,6 +21,8 @@ use warnings;
use DynaLoader;
+use version;
+
BEGIN {
eval 'require Texinfo::ModulePath';
if ($@ ne '') {
@@ -35,6 +37,10 @@ our $TEXINFO_XS;
our $VERSION = '7.1.90';
+# used for comparison with XS version. Before some Perl version
+# (5.38 maybe?), need to be numerical.
+my $numerical_version = version->declare($VERSION)->numify;
+
sub XS_parser_enabled {
return ((not defined($ENV{TEXINFO_XS})
or $ENV{TEXINFO_XS} ne 'omit')
@@ -211,7 +217,8 @@ sub init {
# and thePerl modules VERSION should be synchronized with the top-level
# configure.ac version. The check therefore ensures that the XS objects
# and the Perl module come from the same GNU Texinfo distribution.
- &$boot_fn($module, $VERSION);
+ #print STDERR "REMARK: numerical version: $numerical_version\n";
+ &$boot_fn($module, $numerical_version);
# This makes it easier to refer to packages and symbols by name.
no strict 'refs';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/XS/Makefile.am (XSLIBS_CPPFLAGS), tp/Texinfo/XS/configure.ac (PACKAGE_PERL_NUMERICAL_VERSION) (XS_VERSION), tp/Texinfo/XSLoader.pm ($numerical_version, init): setup numerical versions for XS_VERSION in configure.ac and compare numerical version in XSLoader.pm to compare numerical through bootstrap.,
Patrice Dumas <=