Merge branch 'texlive-trunk' into build/work000 r70987 #158

source/configure

@@ -840,8 +840,6 @@ enable_etex
 enable_etex_synctex
 enable_ptex
 enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
 enable_uptex
 enable_uptex_synctex
 enable_euptex
@@ -1665,8 +1663,6 @@ Optional Features:
   --disable-etex-synctex      build e-TeX without SyncTeX support
   --enable-ptex             compile and install pTeX
   --disable-ptex-synctex      build pTeX without SyncTeX support
-  --enable-eptex            compile and install e-pTeX
-  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
   --disable-uptex-synctex     build upTeX without SyncTeX support
   --disable-euptex          do not compile and install e-upTeX
@@ -5502,28 +5498,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
   need_zlib=yes
 }
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
-  enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
-  enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-uptex was given.
 if test ${enable_uptex+y}
 then :

source/doc/ChangeLog

@@ -1,3 +1,9 @@
+2024-04-18  Karl Berry  <[email protected]>
+
+	* tlbuild.texi (Macros for compilers): mention that
+	-fvisibility-inlines-hidden is not for C,
+	and index -fvisibility... options.
+
 2023-12-23  Karl Berry  <[email protected]>
 
 	* build-tools: autoconf 2.72 and (belatedly) makeinfo 7.1

source/doc/tlbuild.texi

@@ -2,7 +2,7 @@
 @setfilename tlbuild.info
 
 @set version 2024
-@set month-year March 2024
+@set month-year April 2024
 
 @set mytitle Building @TeX{} Live (@value{version})
 @settitle @value{mytitle}
@@ -1233,11 +1233,14 @@ This macro caches its results in the @code{kpse_cv_warning_cflags},
 @end defmac
 
 @defmac KPSE_COMPILER_VISIBILITY
+@vindex -fvisibility=hidden
+@vindex -fvisibility-inlines-hidden
 When using the C or C++ compiler, try to set
 @code{VISIBILITY_C[XX]FLAGS} to flags to hide external symbols.  Call
-@code{AC_SUBST} for this variable.  At present this only tests for
-the compiler option @code{-fvisibility=hidden}, but could be
-extended if necessary.
+@code{AC_SUBST} for this variable.  This tests for the compiler option
+@code{-fvisibility=hidden} and, except for C,
+@code{-fvisibility-inlines-hidden}.  Reports or patches for additional
+tests are welcome.
 
 @vindex kpse_cv_visibility_c[xx]flags
 This macro caches its results in the @code{kpse_cv_visibility_cflags}

source/libs/cairo/configure

@@ -6447,8 +6447,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/configure

@@ -751,8 +751,6 @@ enable_etex
 enable_etex_synctex
 enable_ptex
 enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
 enable_uptex
 enable_uptex_synctex
 enable_euptex
@@ -1553,8 +1551,6 @@ Optional Features:
   --disable-etex-synctex      build e-TeX without SyncTeX support
   --enable-ptex             compile and install pTeX
   --disable-ptex-synctex      build pTeX without SyncTeX support
-  --enable-eptex            compile and install e-pTeX
-  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
   --disable-uptex-synctex     build upTeX without SyncTeX support
   --disable-euptex          do not compile and install e-upTeX
@@ -4550,28 +4546,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
   need_zlib=yes
 }
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
-  enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
-  enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-uptex was given.
 if test ${enable_uptex+y}
 then :

source/libs/gmp/configure

@@ -5912,8 +5912,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/libpng/configure

@@ -6169,8 +6169,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/mpfi/configure

@@ -5689,8 +5689,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/mpfr/configure

@@ -5779,8 +5779,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/pixman/configure

@@ -6218,8 +6218,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/libs/zlib/configure

@@ -5869,8 +5869,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}
 _ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"C" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   CFLAGS="$kpse_save_flags -Werror $kpse_flag"
   if ac_fn_c_try_compile "$LINENO"
 then :

source/m4/ChangeLog

@@ -1,3 +1,9 @@
+2024-04-18  Karl Berry  <[email protected]>
+
+	* kpse-visibility.m4 (_KPSE_VISIBILITY_FLAGS): avoid testing or
+	including -fvisibility-inlines-hidden for C. From Luigi, mail of
+	12 Apr 2024 06:26:23.
+
 2024-02-01  Luigi Scarso  <[email protected]>
 
 	* kpse-pkgs.m4 (kpse_libs_pkgs): add mpfi (new subdir).

source/m4/kpse-visibility.m4

@@ -1,6 +1,6 @@
 # $Id$
 # Public macros for the TeX Live (TL) tree.
-# Copyright 2017-2018 Karl Berry <[email protected]>
+# Copyright 2017-2024 Karl Berry <[email protected]>
 # Copyright 2013-2014 Peter Breitenlohner <[email protected]>
 #
 # This file is free software; the copyright holder
@@ -62,8 +62,19 @@ kpse_save_flags=$AS_TR_CPP($2)
 AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <stdio.h>
                                    extern void foo(void);
                                    void foo(void){printf("foo\n");}]])])
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+# 
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+# 
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+                 "-fvisibility=hidden"; do
+  if test x"$1" = xC \
+     && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+    # C does not support this additional flag; just skip the test.
+    continue
+  fi
   AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag"
   AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break])
 done

source/texk/configure

@@ -751,8 +751,6 @@ enable_etex
 enable_etex_synctex
 enable_ptex
 enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
 enable_uptex
 enable_uptex_synctex
 enable_euptex
@@ -1553,8 +1551,6 @@ Optional Features:
   --disable-etex-synctex      build e-TeX without SyncTeX support
   --enable-ptex             compile and install pTeX
   --disable-ptex-synctex      build pTeX without SyncTeX support
-  --enable-eptex            compile and install e-pTeX
-  --disable-eptex-synctex     build e-pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
   --disable-uptex-synctex     build upTeX without SyncTeX support
   --disable-euptex          do not compile and install e-upTeX
@@ -4550,28 +4546,6 @@ test "x$enable_web2c:$enable_ptex" = xyes:yes && {
   need_ptexenc=yes
   need_zlib=yes
 }
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
-  enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
-  enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-uptex was given.
 if test ${enable_uptex+y}
 then :