texlive[73471] Build/source/m4: configure support for system luajit
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 15 23:51:07 CET 2025
Revision: 73471
https://tug.org/svn/texlive?view=revision&revision=73471
Author: karl
Date: 2025-01-15 23:51:07 +0100 (Wed, 15 Jan 2025)
Log Message:
-----------
configure support for system luajit lib, from j.ne
Modified Paths:
--------------
trunk/Build/source/libs/luajit/ChangeLog
trunk/Build/source/libs/luajit/ac/withenable.ac
trunk/Build/source/m4/ChangeLog
trunk/Build/source/m4/kpse-luajit-flags.m4
trunk/Build/source/m4/kpse-pkgs.m4
Added Paths:
-----------
trunk/Build/source/libs/luajit/ac/luajit.ac
Property Changed:
----------------
trunk/Build/source/libs/luajit/ac/withenable.ac
Modified: trunk/Build/source/libs/luajit/ChangeLog
===================================================================
--- trunk/Build/source/libs/luajit/ChangeLog 2025-01-15 21:00:59 UTC (rev 73470)
+++ trunk/Build/source/libs/luajit/ChangeLog 2025-01-15 22:51:07 UTC (rev 73471)
@@ -1,3 +1,9 @@
+2025-01-15 J. Neusch\"afer <j.ne at posteo.net>
+
+ * ac/withenable.ac: just KPSE_WITH_LIB([luajit]), no more [tree].
+ * ac/luajit.ac: new file for KPSE_TRY_LIB.
+ https://tug.org/pipermail/tex-live/2025-January/051043.html
+
2023-08-23 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* luajiterr.test: Make easier to test on Windows.
@@ -16,7 +22,6 @@
Import LuaJIT-2.1.0-beta3.
* version.ac: Adjust.
-
2016-03-09 Luigi Scarso <luigi.scarso at gmail.com>
Import LuaJIT-2.1.0-beta2.
Added: trunk/Build/source/libs/luajit/ac/luajit.ac
===================================================================
--- trunk/Build/source/libs/luajit/ac/luajit.ac (rev 0)
+++ trunk/Build/source/libs/luajit/ac/luajit.ac 2025-01-15 22:51:07 UTC (rev 73471)
@@ -0,0 +1,10 @@
+dnl $Id$
+## libs/luajit/ac/luajit.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
+dnl
+dnl Copyright 2025 Karl Berry <tex-live at tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## basic check of system luajit
+KPSE_TRY_LIB([luajit],
+ [#include <luajit.h>],
+ [const char *v = LUAJIT_VERSION;])
Property changes on: trunk/Build/source/libs/luajit/ac/luajit.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/libs/luajit/ac/withenable.ac
===================================================================
--- trunk/Build/source/libs/luajit/ac/withenable.ac 2025-01-15 21:00:59 UTC (rev 73470)
+++ trunk/Build/source/libs/luajit/ac/withenable.ac 2025-01-15 22:51:07 UTC (rev 73471)
@@ -1,9 +1,11 @@
+dnl $Id$
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
dnl
-dnl Copyright (C) 2014 Peter Breitenlohner <tex-live at tug.org>
+dnl Copyright 2015-2025 Karl Berry <tex-live at tug.org>
+dnl Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
dnl extra_dirs = libs/luajit/native
dnl
## configure options and TL libraries required for luajit
-KPSE_WITH_LIB([luajit], , [tree])
+KPSE_WITH_LIB([luajit])
Property changes on: trunk/Build/source/libs/luajit/ac/withenable.ac
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/m4/ChangeLog
===================================================================
--- trunk/Build/source/m4/ChangeLog 2025-01-15 21:00:59 UTC (rev 73470)
+++ trunk/Build/source/m4/ChangeLog 2025-01-15 22:51:07 UTC (rev 73471)
@@ -1,3 +1,12 @@
+2025-01-15 J. Neusch\"afer <j.ne at posteo.net>
+
+ configure support for system luajit library.
+ * kpse-luajit-flags.m4 (KPSE_LUAJIT_FLAGS): just [lt], not [lt tree].
+ (KPSE_LUAJIT_OPTIONS, KPSE_LUAJIT_SYSTEM_FLAGS): new defuns.
+ * kpse-pkgs.m4 (KPSE_ALL_SYSTEM_FLAGS): include
+ KPSE_LUAJIT_SYSTEM_FLAGS.
+ https://tug.org/pipermail/tex-live/2025-January/051043.html
+
2024-04-28 Karl Berry <karl at freefriends.org>
* kpse-common.m4 (KPSE_BASIC):
Modified: trunk/Build/source/m4/kpse-luajit-flags.m4
===================================================================
--- trunk/Build/source/m4/kpse-luajit-flags.m4 2025-01-15 21:00:59 UTC (rev 73470)
+++ trunk/Build/source/m4/kpse-luajit-flags.m4 2025-01-15 22:51:07 UTC (rev 73471)
@@ -1,6 +1,6 @@
# $Id$
# Public macros for the TeX Live (TL) tree.
-# Copyright 2019 Karl Berry <tex-live at tug.org>
+# Copyright 2019-2025 Karl Berry <tex-live at tug.org>
# Copyright 2014 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
@@ -13,7 +13,7 @@
# LIBS required for the `-ltexluajit' library in libs/luajit/ of the TL tree.
AC_DEFUN([KPSE_LUAJIT_FLAGS], [dnl
echo 'tldbg:[$0] called.' >&AS_MESSAGE_LOG_FD
-_KPSE_LIB_FLAGS([luajit], [texluajit], [lt tree],
+_KPSE_LIB_FLAGS([luajit], [texluajit], [lt],
[-IBLD/libs/luajit/include],
[BLD/libs/luajit/libtexluajit.la],
[],
@@ -61,6 +61,14 @@
echo 'tldbg:[$0] done.' >&AS_MESSAGE_LOG_FD
]) # KPSE_LUAJIT_FLAGS
+# KPSE_LUAJIT_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_LUAJIT_OPTIONS], [_KPSE_LIB_OPTIONS([luajit], [$1], [pkg-config])])
+
+# KPSE_LUAJIT_SYSTEM_FLAGS
+# ------------------------
+AC_DEFUN([KPSE_LUAJIT_SYSTEM_FLAGS], [_KPSE_PKG_CONFIG_FLAGS([luajit], [luajit])])
+
# KPSE_LUAJIT_DEFINES
# -------------------
# Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when
Modified: trunk/Build/source/m4/kpse-pkgs.m4
===================================================================
--- trunk/Build/source/m4/kpse-pkgs.m4 2025-01-15 21:00:59 UTC (rev 73470)
+++ trunk/Build/source/m4/kpse-pkgs.m4 2025-01-15 22:51:07 UTC (rev 73471)
@@ -1,6 +1,6 @@
# $Id$
# Private Autoconf macros for the TeX Live (TL) tree.
-# Copyright 2016-2024 Karl Berry <tex-live at tug.org>
+# Copyright 2016-2025 Karl Berry <tex-live at tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
@@ -77,6 +77,7 @@
AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ICU_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_LUAJIT_SYSTEM_FLAGS])[]dnl
]) # KPSE_ALL_SYSTEM_FLAGS
# KPSE_UTILS_PKGS()
More information about the tex-live-commits
mailing list.