texlive[45663] Build/source/libs/harfbuzz: harfbuzz 1.6.3 configure:
commits+karl at tug.org
commits+karl at tug.org
Wed Nov 1 01:09:02 CET 2017
Revision: 45663
http://tug.org/svn/texlive?view=revision&revision=45663
Author: karl
Date: 2017-11-01 01:09:02 +0100 (Wed, 01 Nov 2017)
Log Message:
-----------
harfbuzz 1.6.3 configure: gcc -std=c++11 et al.
Modified Paths:
--------------
trunk/Build/source/libs/harfbuzz/ChangeLog
trunk/Build/source/libs/harfbuzz/TLpatches/TL-Changes
trunk/Build/source/libs/harfbuzz/config.h.in
trunk/Build/source/libs/harfbuzz/configure
trunk/Build/source/libs/harfbuzz/configure.ac
Modified: trunk/Build/source/libs/harfbuzz/ChangeLog
===================================================================
--- trunk/Build/source/libs/harfbuzz/ChangeLog 2017-10-31 22:18:56 UTC (rev 45662)
+++ trunk/Build/source/libs/harfbuzz/ChangeLog 2017-11-01 00:09:02 UTC (rev 45663)
@@ -1,3 +1,11 @@
+2017-10-31 Karl Berry <karl at freefriends.org>
+
+ * configure.ac: update AC_CHECK_FUNCS and AC_CHECK_HEADERS
+ for 1.6.3.
+ (CXXFLAGS): merge gcc additions from distribution source,
+ most notably including -std=c++11.
+ (HAVE_GCC): new conditional, also from dist source.
+
2017-10-26 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import harfbuzz-1.6.3.
Modified: trunk/Build/source/libs/harfbuzz/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/libs/harfbuzz/TLpatches/TL-Changes 2017-10-31 22:18:56 UTC (rev 45662)
+++ trunk/Build/source/libs/harfbuzz/TLpatches/TL-Changes 2017-11-01 00:09:02 UTC (rev 45663)
@@ -24,5 +24,4 @@
m4
test
util
- win32 -- deleted upstream
src/hb-ucdn
Modified: trunk/Build/source/libs/harfbuzz/config.h.in
===================================================================
--- trunk/Build/source/libs/harfbuzz/config.h.in 2017-10-31 22:18:56 UTC (rev 45662)
+++ trunk/Build/source/libs/harfbuzz/config.h.in 2017-11-01 00:09:02 UTC (rev 45663)
@@ -39,9 +39,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
/* Define to 1 if you have the `isatty' function. */
#undef HAVE_ISATTY
@@ -54,6 +51,9 @@
/* Define to 1 if you have the `mprotect' function. */
#undef HAVE_MPROTECT
+/* Define to 1 if you have the `newlocale' function. */
+#undef HAVE_NEWLOCALE
+
/* Use native OpenType Layout backend */
#undef HAVE_OT
@@ -60,12 +60,6 @@
/* Use POSIX threads */
#undef HAVE_PTHREAD
-/* Define to 1 if you have the <sched.h> header file. */
-#undef HAVE_SCHED_H
-
-/* Define to 1 if you have the `sched_yield' function. */
-#undef HAVE_SCHED_YIELD
-
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -78,6 +72,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strtod_l' function. */
+#undef HAVE_STRTOD_L
+
/* Define to 1 if you have the `sysconf' function. */
#undef HAVE_SYSCONF
@@ -99,8 +96,8 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if you have the `_setmode' function. */
-#undef HAVE__SETMODE
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
/* Name of package */
#undef PACKAGE
Modified: trunk/Build/source/libs/harfbuzz/configure
===================================================================
--- trunk/Build/source/libs/harfbuzz/configure 2017-10-31 22:18:56 UTC (rev 45662)
+++ trunk/Build/source/libs/harfbuzz/configure 2017-11-01 00:09:02 UTC (rev 45663)
@@ -630,6 +630,8 @@
build_FALSE
build_TRUE
AM_CXXFLAGS
+HAVE_GCC_FALSE
+HAVE_GCC_TRUE
EGREP
GREP
CPP
@@ -5778,7 +5780,7 @@
# Functions and headers
-for ac_func in atexit mprotect sysconf getpagesize sched_yield mmap _setmode isatty
+for ac_func in atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6187,7 +6189,7 @@
done
-for ac_header in unistd.h sys/mman.h sched.h io.h
+for ac_header in unistd.h sys/mman.h xlocale.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -6239,17 +6241,48 @@
if test "x$GCC" = "xyes"; then
+
+ # Make symbols link locally
+ LDFLAGS="$LDFLAGS -Bsymbolic-functions"
+
+ # Choose C++ version
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+
+ # Make sure we don't link to libstdc++
+ CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ # Assorted warnings
+ CXXFLAGS="$CXXFLAGS -Wcast-align"
+
case "$host" in
+ *-*-mingw*)
+ ;;
+ *)
+ # Hide inline methods
+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+ ;;
+ esac
+
+ case "$host" in
arm-*-*)
if test "x$ac_cv_alignof_struct_char__" != x1; then
# Request byte alignment
- AM_CXXFLAGS="-mstructure-size-boundary=8"
+ CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
fi
;;
esac
fi
+ if test "x$GCC" = "xyes"; then
+ HAVE_GCC_TRUE=
+ HAVE_GCC_FALSE='#'
+else
+ HAVE_GCC_TRUE='#'
+ HAVE_GCC_FALSE=
+fi
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -6465,6 +6498,10 @@
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_GCC_TRUE}" && test -z "${HAVE_GCC_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
as_fn_error $? "conditional \"build\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Modified: trunk/Build/source/libs/harfbuzz/configure.ac
===================================================================
--- trunk/Build/source/libs/harfbuzz/configure.ac 2017-10-31 22:18:56 UTC (rev 45662)
+++ trunk/Build/source/libs/harfbuzz/configure.ac 2017-11-01 00:09:02 UTC (rev 45663)
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2012-2015 Peter Breitenlohner <tex-live at tug.org>
+dnl Copyright 2016-2017 Karl Berry <tex-live at tug.org>
+dnl Copyright 2012-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -30,22 +31,46 @@
KPSE_ICU_FLAGS
# Functions and headers
-AC_CHECK_FUNCS([atexit mprotect sysconf getpagesize sched_yield mmap _setmode isatty])
-AC_CHECK_HEADERS([unistd.h sys/mman.h sched.h io.h])
+AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty newlocale strtod_l)
+AC_CHECK_HEADERS(unistd.h sys/mman.h xlocale.h)
# Compiler flags
AC_CANONICAL_HOST
AC_CHECK_ALIGNOF([struct{char;}])
if test "x$GCC" = "xyes"; then
+
+ # Make symbols link locally
+ LDFLAGS="$LDFLAGS -Bsymbolic-functions"
+
+ # Choose C++ version
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+
+ # Make sure we don't link to libstdc++
+ CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ # Assorted warnings
+ CXXFLAGS="$CXXFLAGS -Wcast-align"
+
case "$host" in
+ *-*-mingw*)
+ ;;
+ *)
+ # Hide inline methods
+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+ ;;
+ esac
+
+ case "$host" in
arm-*-*)
if test "x$ac_cv_alignof_struct_char__" != x1; then
# Request byte alignment
- AM_CXXFLAGS="-mstructure-size-boundary=8"
+ CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
fi
;;
esac
fi
+AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes")
+
AC_SUBST([AM_CXXFLAGS])
AC_CONFIG_HEADERS([config.h])
More information about the tex-live-commits
mailing list