summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/utils/xindy/ChangeLog9
-rw-r--r--Build/source/utils/xindy/TLpatches/patch-12-xindy-mac18
-rw-r--r--Build/source/utils/xindy/tests/ChangeLog7
-rw-r--r--Build/source/utils/xindy/tests/idxhello.idx4
-rw-r--r--Build/source/utils/xindy/tests/idxhello.tex1
-rw-r--r--Build/source/utils/xindy/xindy-src/user-commands/xindy.in4
-rw-r--r--Master/bin/universal-darwin/xindy-arm64.membin0 -> 936449 bytes
-rw-r--r--Master/bin/universal-darwin/xindy-x86_64.membin0 -> 933362 bytes
-rw-r--r--Master/bin/universal-darwin/xindy.membin1155912 -> 0 bytes
-rwxr-xr-xMaster/bin/universal-darwin/xindy.runbin2831424 -> 5616544 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/xindy/xindy.pl4
11 files changed, 45 insertions, 2 deletions
diff --git a/Build/source/utils/xindy/ChangeLog b/Build/source/utils/xindy/ChangeLog
index 6fd49c7fcfe..eb2e22a7ce4 100644
--- a/Build/source/utils/xindy/ChangeLog
+++ b/Build/source/utils/xindy/ChangeLog
@@ -1,3 +1,12 @@
+2021-07-06 Karl Berry <karl@tug.org>
+
+ * xindy-src/user-commands/xindy.in: for the Mac,
+ xindy.run (aka clisp) is now built as a universal binary (x86_64+arm),
+ so have to find arch-specific mem file. as we did in the past
+ for PowerPC vs. x86_64.
+ * TLpatches/patch-12-xindy-mac: new file.
+ The patches to xindy.in from original upstream
+
2020-06-07 Karl Berry <karl@freefriends.org>
* ac/withenable.ac: omit $Id$ from generated output.
diff --git a/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac b/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac
new file mode 100644
index 00000000000..29bfaf1130c
--- /dev/null
+++ b/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac
@@ -0,0 +1,18 @@
+ xindy.run (aka clisp) built as universal binary with lipo,
+ have to find arch-specific mem file.
+
+Index: xindy.in
+===================================================================
+--- xindy.in (revision 59852)
++++ xindy.in (working copy)
+@@ -511,6 +511,10 @@
+ my @uname = POSIX::uname();
+ if ( $uname[4] eq 'Power Macintosh' ) {
+ $mem_file = "$lib_dir/xindy-ppc.mem";
++ } else if ( $uname[4] eq 'x86_64' ) {
++ $mem_file = "$lib_dir/xindy-x86_64.mem";
++ } else if ( $uname[4] eq 'arm64' ) {
++ $mem_file = "$lib_dir/xindy-arm64.mem";
+ } else {
+ $mem_file = "$lib_dir/xindy-i386.mem";
+ }
diff --git a/Build/source/utils/xindy/tests/ChangeLog b/Build/source/utils/xindy/tests/ChangeLog
new file mode 100644
index 00000000000..82f969248d0
--- /dev/null
+++ b/Build/source/utils/xindy/tests/ChangeLog
@@ -0,0 +1,7 @@
+2021-07-06 Karl Berry <karl@tug.org>
+
+ * idxhello.tex: add necessary \usepackage{makeidx}\makeindex.
+ * idxhello.idx: regenerate.
+
+(This ChangeLog file public domain.)
+
diff --git a/Build/source/utils/xindy/tests/idxhello.idx b/Build/source/utils/xindy/tests/idxhello.idx
index 5f3b98d84d0..f01890f9dc8 100644
--- a/Build/source/utils/xindy/tests/idxhello.idx
+++ b/Build/source/utils/xindy/tests/idxhello.idx
@@ -1,2 +1,2 @@
-\indexentry{there}{1}
-\indexentry{hello}{1}
+\indexentry{xyz}{1}
+\indexentry{abc}{1}
diff --git a/Build/source/utils/xindy/tests/idxhello.tex b/Build/source/utils/xindy/tests/idxhello.tex
index 6c709ae075e..59523b5df85 100644
--- a/Build/source/utils/xindy/tests/idxhello.tex
+++ b/Build/source/utils/xindy/tests/idxhello.tex
@@ -7,6 +7,7 @@
% out of Master/bin/*.
%
\documentclass{article}
+\usepackage{makeidx}\makeindex
\begin{document}
\index{xyz}xyz
\index{abc}abc
diff --git a/Build/source/utils/xindy/xindy-src/user-commands/xindy.in b/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
index df52dd948c9..2010eb81067 100644
--- a/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
+++ b/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
@@ -511,6 +511,10 @@ if ( $OSNAME eq 'darwin' && ! -e $mem_file ) {
my @uname = POSIX::uname();
if ( $uname[4] eq 'Power Macintosh' ) {
$mem_file = "$lib_dir/xindy-ppc.mem";
+ } else if ( $uname[4] eq 'x86_64' ) {
+ $mem_file = "$lib_dir/xindy-x86_64.mem";
+ } else if ( $uname[4] eq 'arm64' ) {
+ $mem_file = "$lib_dir/xindy-arm64.mem";
} else {
$mem_file = "$lib_dir/xindy-i386.mem";
}
diff --git a/Master/bin/universal-darwin/xindy-arm64.mem b/Master/bin/universal-darwin/xindy-arm64.mem
new file mode 100644
index 00000000000..9a83d72e760
--- /dev/null
+++ b/Master/bin/universal-darwin/xindy-arm64.mem
Binary files differ
diff --git a/Master/bin/universal-darwin/xindy-x86_64.mem b/Master/bin/universal-darwin/xindy-x86_64.mem
new file mode 100644
index 00000000000..0b2459770af
--- /dev/null
+++ b/Master/bin/universal-darwin/xindy-x86_64.mem
Binary files differ
diff --git a/Master/bin/universal-darwin/xindy.mem b/Master/bin/universal-darwin/xindy.mem
deleted file mode 100644
index 79428488058..00000000000
--- a/Master/bin/universal-darwin/xindy.mem
+++ /dev/null
Binary files differ
diff --git a/Master/bin/universal-darwin/xindy.run b/Master/bin/universal-darwin/xindy.run
index d23f8ba2c17..052e19ae33b 100755
--- a/Master/bin/universal-darwin/xindy.run
+++ b/Master/bin/universal-darwin/xindy.run
Binary files differ
diff --git a/Master/texmf-dist/scripts/xindy/xindy.pl b/Master/texmf-dist/scripts/xindy/xindy.pl
index 71d4f2aec4f..2eafd3b1783 100755
--- a/Master/texmf-dist/scripts/xindy/xindy.pl
+++ b/Master/texmf-dist/scripts/xindy/xindy.pl
@@ -511,6 +511,10 @@ if ( $OSNAME eq 'darwin' && ! -e $mem_file ) {
my @uname = POSIX::uname();
if ( $uname[4] eq 'Power Macintosh' ) {
$mem_file = "$lib_dir/xindy-ppc.mem";
+ } else if ( $uname[4] eq 'x86_64' ) {
+ $mem_file = "$lib_dir/xindy-x86_64.mem";
+ } else if ( $uname[4] eq 'arm64' ) {
+ $mem_file = "$lib_dir/xindy-arm64.mem";
} else {
$mem_file = "$lib_dir/xindy-i386.mem";
}