texlive[59854] trunk: xindy on mac now has a universal clisp binary

commits+karl at tug.org commits+karl at tug.org
Tue Jul 6 19:14:53 CEST 2021


Revision: 59854
          http://tug.org/svn/texlive?view=revision&revision=59854
Author:   karl
Date:     2021-07-06 19:14:52 +0200 (Tue, 06 Jul 2021)
Log Message:
-----------
xindy on mac now has a universal clisp binary and arch-specific mem files

Modified Paths:
--------------
    trunk/Build/source/utils/xindy/ChangeLog
    trunk/Build/source/utils/xindy/tests/idxhello.idx
    trunk/Build/source/utils/xindy/tests/idxhello.tex
    trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
    trunk/Master/bin/universal-darwin/xindy.run
    trunk/Master/texmf-dist/scripts/xindy/xindy.pl

Added Paths:
-----------
    trunk/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac
    trunk/Build/source/utils/xindy/tests/ChangeLog
    trunk/Master/bin/universal-darwin/xindy-arm64.mem
    trunk/Master/bin/universal-darwin/xindy-x86_64.mem

Removed Paths:
-------------
    trunk/Master/bin/universal-darwin/xindy.mem

Modified: trunk/Build/source/utils/xindy/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/ChangeLog	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Build/source/utils/xindy/ChangeLog	2021-07-06 17:14:52 UTC (rev 59854)
@@ -1,3 +1,12 @@
+2021-07-06  Karl Berry  <karl at 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 at freefriends.org>
 
 	* ac/withenable.ac: omit $Id$ from generated output.

Added: trunk/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac
===================================================================
--- trunk/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac	                        (rev 0)
+++ trunk/Build/source/utils/xindy/TLpatches/patch-12-xindy-mac	2021-07-06 17:14:52 UTC (rev 59854)
@@ -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";
+     }

Added: trunk/Build/source/utils/xindy/tests/ChangeLog
===================================================================
--- trunk/Build/source/utils/xindy/tests/ChangeLog	                        (rev 0)
+++ trunk/Build/source/utils/xindy/tests/ChangeLog	2021-07-06 17:14:52 UTC (rev 59854)
@@ -0,0 +1,7 @@
+2021-07-06  Karl Berry  <karl at tug.org>
+
+	* idxhello.tex: add necessary \usepackage{makeidx}\makeindex.
+	* idxhello.idx: regenerate.
+
+(This ChangeLog file public domain.)
+

Modified: trunk/Build/source/utils/xindy/tests/idxhello.idx
===================================================================
--- trunk/Build/source/utils/xindy/tests/idxhello.idx	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Build/source/utils/xindy/tests/idxhello.idx	2021-07-06 17:14:52 UTC (rev 59854)
@@ -1,2 +1,2 @@
-\indexentry{there}{1}
-\indexentry{hello}{1}
+\indexentry{xyz}{1}
+\indexentry{abc}{1}

Modified: trunk/Build/source/utils/xindy/tests/idxhello.tex
===================================================================
--- trunk/Build/source/utils/xindy/tests/idxhello.tex	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Build/source/utils/xindy/tests/idxhello.tex	2021-07-06 17:14:52 UTC (rev 59854)
@@ -7,6 +7,7 @@
 % out of Master/bin/*.
 %
 \documentclass{article}
+\usepackage{makeidx}\makeindex
 \begin{document}
 \index{xyz}xyz
 \index{abc}abc

Modified: trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in
===================================================================
--- trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Build/source/utils/xindy/xindy-src/user-commands/xindy.in	2021-07-06 17:14:52 UTC (rev 59854)
@@ -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";
     }

Added: trunk/Master/bin/universal-darwin/xindy-arm64.mem
===================================================================
(Binary files differ)

Index: trunk/Master/bin/universal-darwin/xindy-arm64.mem
===================================================================
--- trunk/Master/bin/universal-darwin/xindy-arm64.mem	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Master/bin/universal-darwin/xindy-arm64.mem	2021-07-06 17:14:52 UTC (rev 59854)

Property changes on: trunk/Master/bin/universal-darwin/xindy-arm64.mem
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/bin/universal-darwin/xindy-x86_64.mem
===================================================================
(Binary files differ)

Index: trunk/Master/bin/universal-darwin/xindy-x86_64.mem
===================================================================
--- trunk/Master/bin/universal-darwin/xindy-x86_64.mem	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Master/bin/universal-darwin/xindy-x86_64.mem	2021-07-06 17:14:52 UTC (rev 59854)

Property changes on: trunk/Master/bin/universal-darwin/xindy-x86_64.mem
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/Master/bin/universal-darwin/xindy.mem
===================================================================
(Binary files differ)

Modified: trunk/Master/bin/universal-darwin/xindy.run
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/xindy/xindy.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/xindy/xindy.pl	2021-07-05 23:48:48 UTC (rev 59853)
+++ trunk/Master/texmf-dist/scripts/xindy/xindy.pl	2021-07-06 17:14:52 UTC (rev 59854)
@@ -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";
     }



More information about the tex-live-commits mailing list.