diff options
| author | Karl Berry <karl@freefriends.org> | 2017-12-02 23:50:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-12-02 23:50:45 +0000 |
| commit | ff851df1c782b55606f010e5b34ea9b26f5b7f1b (patch) | |
| tree | 502e52e57b24a5439538e01a31bacb7189464dab | |
| parent | d504191c4ade282e5e3fbfc6e3c76f3702b4ea0b (diff) | |
KPSE_COMPILER_VISIBILITY: do not restore from kpse_save_flags unless it was set
git-svn-id: svn://tug.org/texlive/trunk@45970 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/m4/ChangeLog | 10 | ||||
| -rw-r--r-- | Build/source/m4/kpse-visibility.m4 | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index ca963326323..63200884121 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,11 @@ +2017-12-02 Karl Berry <karl@freefriends.org> + + * kpse-visibility.m4 (KPSE_COMPILER_VISIBILITY): write debug line. + (_KPSE_VISIBILITY_FLAGS): only restore from kpse_save_flags + if we set it, i.e., if not using the cached value. (Otherwise, + e.g., in libpng, we can end up overriding the user-set CFLAGS with + the empty string.) + 2017-11-02 Karl Berry <karl@freefriends.org> * kpse-setup.m4 (_KPSE_RECURSE): revert previous change, @@ -5,7 +13,7 @@ and (2) for 2018, more packages (icu, poppler, ...) are going to require C++11, so we can't hack around it again. So not worth spending more time refining. - Also, add debugging line writing to >&AS_MESSAGE_LOG_FD (config.log). + Also, write debug line to >&AS_MESSAGE_LOG_FD (config.log). reautoconf. 2017-02-17 Karl Berry <karl@freefriends.org> diff --git a/Build/source/m4/kpse-visibility.m4 b/Build/source/m4/kpse-visibility.m4 index 8eeb029cc58..452e354d08e 100644 --- a/Build/source/m4/kpse-visibility.m4 +++ b/Build/source/m4/kpse-visibility.m4 @@ -1,5 +1,7 @@ +# $Id$ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org> +# Copyright 2017 Karl Berry <tex-live@tug.org> +# Copyright 2013-2014 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -13,6 +15,7 @@ # them a Makefile.am must use them, e.g., in AM_CFLAGS or AM_CXXFLAGS. AC_DEFUN([KPSE_COMPILER_VISIBILITY], [dnl arrange that AC_PROG_CC uses _KPSE_VISIBILITY_CFLAGS etc. +echo 'dbg:[_KPSE_COMPILER_VISIBILITY] called.' >&AS_MESSAGE_LOG_FD AC_PROVIDE_IFELSE([AC_PROG_CC], [_KPSE_VISIBILITY_CFLAGS], [m4_define([AC_PROG_CC], @@ -64,11 +67,10 @@ for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag" AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break]) done +AS_TR_CPP($2)=$kpse_save_flags AC_LANG_POP([$1]) ]) -AS_TR_CPP($2)=$kpse_save_flags AS_CASE([$kpse_cv_visibility_$2], [unknown], [], [AC_SUBST([VISIBILITY_]AS_TR_CPP($2), [$kpse_cv_visibility_$2])]) ]) # _KPSE_VISIBILITY_FLAGS - |