sync with luatex rev.7174: luatex and luahbtex and jit variants

git-svn-id: svn://tug.org/texlive/trunk@51577 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 54 insertions, 2 deletions

diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 114dc9f4776..09e147c5665 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -733,6 +733,8 @@ enable_pdftex
 enable_pdftex_synctex
 enable_luatex
 enable_luajittex
+enable_luahbtex
+enable_luajithbtex
 enable_mp
 enable_pmp
 enable_upmp
@@ -1518,6 +1520,8 @@ Optional Features:
   --disable-pdftex-synctex    build pdfTeX without SyncTeX support
   --disable-luatex          do not compile and install LuaTeX
   --disable-luajittex       do not compile and install LuaJITTeX
+  --disable-luahbtex        do not compile and install LuaHBTeX
+  --disable-luajithbtex     do not compile and install LuaHBJITTeX
   --disable-mp              do not compile and install MetaPost
   --disable-pmp             do not compile and install pMetaPost
   --disable-upmp            do not compile and install upMetaPost
@@ -3669,7 +3673,7 @@ test "x$enable_web2c" = xno || {
   need_zlib=yes
 }
 
-# $Id: web2c.ac 50341 2019-03-11 22:04:24Z karl $
+# $Id: web2c.ac 50341M 2019-07-07 22:53:58Z (local) $
 # texk/web2c/ac/web2c.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
 ## configure options for TeX and MF
 
@@ -3863,6 +3867,40 @@ test "x$enable_web2c:$enable_luajittex" = xyes:yes && {
   need_zziplib=yes
   need_luajit=yes
 }
+# Check whether --enable-luahbtex was given.
+if test "${enable_luahbtex+set}" = set; then :
+  enableval=$enable_luahbtex;
+fi
+case $enable_luahbtex in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_luahbtex=yes ;;
+esac
+
+test "x$enable_web2c:$enable_luahbtex" = xyes:yes && {
+  need_libpng=yes
+  need_zziplib=yes
+  need_lua53=yes
+  need_harfbuzz=yes
+}
+# Check whether --enable-luajithbtex was given.
+if test "${enable_luajithbtex+set}" = set; then :
+  enableval=$enable_luajithbtex;
+fi
+case $enable_luajithbtex in #(
+  yes | no) :
+     ;; #(
+  *) :
+    enable_luajithbtex=yes ;;
+esac
+
+test "x$enable_web2c:$enable_luajithbtex" = xyes:yes && {
+  need_libpng=yes
+  need_zziplib=yes
+  need_luajit=yes
+  need_harfbuzz=yes
+}
 # Check whether --enable-mp was given.
 if test "${enable_mp+set}" = set; then :
   enableval=$enable_mp;
diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am
index ed994d10d3c..74d78959275 100644
--- a/Build/source/libs/harfbuzz/Makefile.am
+++ b/Build/source/libs/harfbuzz/Makefile.am
@@ -29,6 +29,9 @@ noinst_LIBRARIES = libharfbuzz.a
 ## common
 AM_CPPFLAGS = -DHB_NO_MT -DHAVE_FALLBACK=1 \
 	-I$(top_srcdir)/$(HARFBUZZ_SRC)
+## For luahbtex we need this (and the rest ?)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(WARNING_CXXFLAGS)
+
 libharfbuzz_dependencies =
 libharfbuzz_a_SOURCES =  \
 	@HARFBUZZ_TREE@/src/hb-algs.hh \
diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in
index 4dfc7a47ee6..1a3f689ffd2 100644
--- a/Build/source/libs/harfbuzz/Makefile.in
+++ b/Build/source/libs/harfbuzz/Makefile.in
@@ -577,7 +577,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(WARNING_CXXFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
diff --git a/Build/source/libs/zziplib/TLpatches/patch-01-header b/Build/source/libs/zziplib/TLpatches/patch-01-header
new file mode 100644
index 00000000000..3364f16f99a
--- /dev/null
+++ b/Build/source/libs/zziplib/TLpatches/patch-01-header
@@ -0,0 +1,11 @@
+diff -ur lib.h.orig lib.h 
+--- lib.h.orig	2018-06-26 21:16:01.758253475 +0200
++++ lib.h	2018-06-26 21:16:15.786252900 +0200
+@@ -16,6 +16,7 @@
+ #include <zzip/zzip.h>
+ #include <zzip/plugin.h>
+ #include <zzip/stdint.h>
++#include <zzip/zzip32.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {