diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-01 00:09:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-01 00:09:02 +0000 |
commit | 1678d8502cb714a244fe67ac5acc99901ad471e3 (patch) | |
tree | 25993939325d5965a17f1003692c845c5cd390c8 /Build/source/libs/harfbuzz | |
parent | dbd0461bf5d6723d35019ce3bd3a99a4ac1f418f (diff) |
harfbuzz 1.6.3 configure: gcc -std=c++11 et al.
git-svn-id: svn://tug.org/texlive/trunk@45663 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz')
-rw-r--r-- | Build/source/libs/harfbuzz/ChangeLog | 8 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/TLpatches/TL-Changes | 1 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/config.h.in | 19 | ||||
-rwxr-xr-x | Build/source/libs/harfbuzz/configure | 43 | ||||
-rw-r--r-- | Build/source/libs/harfbuzz/configure.ac | 33 |
5 files changed, 85 insertions, 19 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 3217f432414..092eb4cfcc1 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,11 @@ +2017-10-31 Karl Berry <karl@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@fuk.kindai.ac.jp> Import harfbuzz-1.6.3. diff --git a/Build/source/libs/harfbuzz/TLpatches/TL-Changes b/Build/source/libs/harfbuzz/TLpatches/TL-Changes index cabc236b736..d0af37b0f32 100644 --- a/Build/source/libs/harfbuzz/TLpatches/TL-Changes +++ b/Build/source/libs/harfbuzz/TLpatches/TL-Changes @@ -24,5 +24,4 @@ Removed unused dirs: m4 test util - win32 -- deleted upstream src/hb-ucdn diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in index 345759d3cd1..d5e621194e8 100644 --- a/Build/source/libs/harfbuzz/config.h.in +++ b/Build/source/libs/harfbuzz/config.h.in @@ -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,18 +51,15 @@ /* 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 /* 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 diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 19ba3fe485d..5fd46d3bf31 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -630,6 +630,8 @@ HARFBUZZ_TREE build_FALSE build_TRUE AM_CXXFLAGS +HAVE_GCC_FALSE +HAVE_GCC_TRUE EGREP GREP CPP @@ -5778,7 +5780,7 @@ fi # 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 @@ fi 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,15 +6241,46 @@ _ACEOF 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 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then 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 diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac index 75e3ae77176..a0f03b4bfb4 100644 --- a/Build/source/libs/harfbuzz/configure.ac +++ b/Build/source/libs/harfbuzz/configure.ac @@ -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@tug.org> +dnl Copyright 2016-2017 Karl Berry <tex-live@tug.org> +dnl Copyright 2012-2015 Peter Breitenlohner <tex-live@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_GRAPHITE2_FLAGS 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]) |