From 4745714e751cdaaaf25911db917ea20b34c072ef Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 2 Dec 2014 10:45:27 +0000 Subject: libs/cairo: Hide symbols (for Luigi) git-svn-id: svn://tug.org/texlive/trunk@35717 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/cairo/ChangeLog | 5 ++ Build/source/libs/cairo/Makefile.am | 2 +- Build/source/libs/cairo/Makefile.in | 4 +- Build/source/libs/cairo/aclocal.m4 | 1 + Build/source/libs/cairo/cairo/Makefile.in | 2 + Build/source/libs/cairo/configure | 51 ++++++++++++++++ Build/source/libs/cairo/configure.ac | 4 +- Build/source/libs/zlib/configure | 4 +- Build/source/m4/ChangeLog | 4 ++ Build/source/m4/kpse-visibility.m4 | 6 +- Build/source/texk/dvisvgm/ChangeLog | 4 ++ Build/source/texk/dvisvgm/Makefile.in | 3 - Build/source/texk/dvisvgm/aclocal.m4 | 1 - Build/source/texk/dvisvgm/configure | 99 ------------------------------- Build/source/texk/dvisvgm/configure.ac | 4 +- 15 files changed, 80 insertions(+), 114 deletions(-) (limited to 'Build/source') diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index e3152846b47..1fa7b8e2bde 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,3 +1,8 @@ +2014-12-02 Peter Breitenlohner + + * configure.ac: Added KPSE_COMPILER_VISIBILITY. + * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS). + 2014-10-15 Peter Breitenlohner Import cairo-1.14.0. diff --git a/Build/source/libs/cairo/Makefile.am b/Build/source/libs/cairo/Makefile.am index 148d5365c99..650f31dafcf 100644 --- a/Build/source/libs/cairo/Makefile.am +++ b/Build/source/libs/cairo/Makefile.am @@ -24,7 +24,7 @@ dist-hook: SUBDIRS = . cairo AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX -AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) +AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) noinst_LIBRARIES = libcairo.a diff --git a/Build/source/libs/cairo/Makefile.in b/Build/source/libs/cairo/Makefile.in index be9496be886..70effb4cfb5 100644 --- a/Build/source/libs/cairo/Makefile.in +++ b/Build/source/libs/cairo/Makefile.in @@ -158,6 +158,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \ $(top_srcdir)/m4/cairo-features.m4 $(top_srcdir)/m4/float.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -850,6 +851,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -905,7 +907,7 @@ EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES CAIRO_SRC = $(CAIRO_TREE)/src SUBDIRS = . cairo AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX -AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) +AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) noinst_LIBRARIES = libcairo.a libcairo_a_SOURCES = @CAIRO_TREE@/src/cairo-analysis-surface.c \ @CAIRO_TREE@/src/cairo-arc.c @CAIRO_TREE@/src/cairo-array.c \ diff --git a/Build/source/libs/cairo/aclocal.m4 b/Build/source/libs/cairo/aclocal.m4 index 4ef8628bf14..e125205b232 100644 --- a/Build/source/libs/cairo/aclocal.m4 +++ b/Build/source/libs/cairo/aclocal.m4 @@ -1188,4 +1188,5 @@ m4_include([m4/cairo-features.m4]) m4_include([m4/float.m4]) m4_include([../../m4/kpse-common.m4]) m4_include([../../m4/kpse-pixman-flags.m4]) +m4_include([../../m4/kpse-visibility.m4]) m4_include([../../m4/kpse-warnings.m4]) diff --git a/Build/source/libs/cairo/cairo/Makefile.in b/Build/source/libs/cairo/cairo/Makefile.in index a77fd8e87ce..61371cf9255 100644 --- a/Build/source/libs/cairo/cairo/Makefile.in +++ b/Build/source/libs/cairo/cairo/Makefile.in @@ -93,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \ $(top_srcdir)/m4/cairo-features.m4 $(top_srcdir)/m4/float.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -177,6 +178,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure index c7c69947a0a..fce04bd9916 100755 --- a/Build/source/libs/cairo/configure +++ b/Build/source/libs/cairo/configure @@ -699,6 +699,7 @@ CAIRO_HAS_FC_FONT_TRUE build_FALSE build_TRUE CAIRO_ATTRIBUTE_FLAG +VISIBILITY_CFLAGS LN_S RANLIB WARNING_CFLAGS @@ -5709,6 +5710,56 @@ esac esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5 +$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; } +if ${kpse_cv_visibility_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +kpse_cv_visibility_cflags=unknown +kpse_save_flags=$CFLAGS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + 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 + CFLAGS="$kpse_save_flags -Werror $kpse_flag" + if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_visibility_cflags=$kpse_flag; break +fi +rm -f core conftest.err conftest.$ac_objext +done +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5 +$as_echo "$kpse_cv_visibility_cflags" >&6; } +CFLAGS=$kpse_save_flags +case $kpse_cv_visibility_cflags in #( + unknown) : + ;; #( + *) : + VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags + ;; +esac + + + + + cairo_attribute_flag= if test "x$GCC" = xyes; then case `$CC -dumpversion` in #( diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac index 27fe9c7c35e..8818bcc142b 100644 --- a/Build/source/libs/cairo/configure.ac +++ b/Build/source/libs/cairo/configure.ac @@ -22,10 +22,12 @@ AC_PROG_RANLIB AC_PROG_LN_S CAIRO_BIGENDIAN +KPSE_COMPILER_VISIBILITY + cairo_attribute_flag= if test "x$GCC" = xyes; then AS_CASE([`$CC -dumpversion`], - [4.@<:@01@:>@.* ], [], + [4.[[01]].* ], [], [4.* | 5.*], [cairo_attribute_flag=-Wno-attributes]) fi AC_SUBST([CAIRO_ATTRIBUTE_FLAG], [$cairo_attribute_flag]) diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure index a81e8a5d252..f55d179936d 100755 --- a/Build/source/libs/zlib/configure +++ b/Build/source/libs/zlib/configure @@ -4719,8 +4719,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext void foo(void){printf("foo\n");} _ACEOF # FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden'; do - CFLAGS="$kpse_save_flags $kpse_flag" +for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do + CFLAGS="$kpse_save_flags -Werror $kpse_flag" if ac_fn_c_try_compile "$LINENO"; then : kpse_cv_visibility_cflags=$kpse_flag; break fi diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index d5882502be9..4dd0c4ce8b5 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2014-12-02 Peter Breitenlohner + + * kpse-visibility.m4: Also try -fvisibility-inlines-hidden. + 2014-11-17 Peter Breitenlohner * kpse-win32.m4: Check for WIN64 and AC_SUBST([WIN_WRAPPER]). diff --git a/Build/source/m4/kpse-visibility.m4 b/Build/source/m4/kpse-visibility.m4 index 740fc459a53..f5db6f9da09 100644 --- a/Build/source/m4/kpse-visibility.m4 +++ b/Build/source/m4/kpse-visibility.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2013 Peter Breitenlohner +# Copyright (C) 2013, 2014 Peter Breitenlohner # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -60,8 +60,8 @@ AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include extern void foo(void); void foo(void){printf("foo\n");}]])]) # FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden'; do - AS_TR_CPP($2)="$kpse_save_flags $kpse_flag" +for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do + AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag" AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break]) done AC_LANG_POP([$1]) diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 2d1f90fbab7..8b33e329999 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2014-12-02 Peter Breitenlohner + + * configure.ac: Drop useless KPSE_COMPILER_VISIBILITY. + 2014-09-15 Peter Breitenlohner * Imported release 1.8.1. diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index 37299b2beaa..23eedf95cf6 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -106,7 +106,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \ - $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ @@ -615,8 +614,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ -VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ diff --git a/Build/source/texk/dvisvgm/aclocal.m4 b/Build/source/texk/dvisvgm/aclocal.m4 index 624e6e28cde..7fb3b00f8e2 100644 --- a/Build/source/texk/dvisvgm/aclocal.m4 +++ b/Build/source/texk/dvisvgm/aclocal.m4 @@ -1188,7 +1188,6 @@ m4_include([../../m4/kpse-cxx-hack.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-potrace-flags.m4]) -m4_include([../../m4/kpse-visibility.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-win32.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index abe88c2e2b6..66d3e367caf 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -661,7 +661,6 @@ KPATHSEA_INCLUDES WIN32_FALSE WIN32_TRUE CXXLD -VISIBILITY_CXXFLAGS CXXCPP WARNING_CXXFLAGS am__fastdepCXX_FALSE @@ -670,7 +669,6 @@ CXXDEPMODE ac_ct_CXX CXXFLAGS CXX -VISIBILITY_CFLAGS CPP OTOOL64 OTOOL @@ -13394,56 +13392,6 @@ fi ac_config_headers="$ac_config_headers config.h" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5 -$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; } -if ${kpse_cv_visibility_cflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -kpse_cv_visibility_cflags=unknown -kpse_save_flags=$CFLAGS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - extern void foo(void); - void foo(void){printf("foo\n");} -_ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden'; do - CFLAGS="$kpse_save_flags $kpse_flag" - if ac_fn_c_try_compile "$LINENO"; then : - kpse_cv_visibility_cflags=$kpse_flag; break -fi -rm -f core conftest.err conftest.$ac_objext -done -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5 -$as_echo "$kpse_cv_visibility_cflags" >&6; } -CFLAGS=$kpse_save_flags -case $kpse_cv_visibility_cflags in #( - unknown) : - ;; #( - *) : - VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags - ;; -esac - - - - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -17065,53 +17013,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for C++ to hide external symbols" >&5 -$as_echo_n "checking CXXFLAGS for C++ to hide external symbols... " >&6; } -if ${kpse_cv_visibility_cxxflags+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -kpse_cv_visibility_cxxflags=unknown -kpse_save_flags=$CXXFLAGS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - extern void foo(void); - void foo(void){printf("foo\n");} -_ACEOF -# FIXME: Add tests for non-GNU compilers -for kpse_flag in '-fvisibility=hidden'; do - CXXFLAGS="$kpse_save_flags $kpse_flag" - if ac_fn_cxx_try_compile "$LINENO"; then : - kpse_cv_visibility_cxxflags=$kpse_flag; break -fi -rm -f core conftest.err conftest.$ac_objext -done -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cxxflags" >&5 -$as_echo "$kpse_cv_visibility_cxxflags" >&6; } -CXXFLAGS=$kpse_save_flags -case $kpse_cv_visibility_cxxflags in #( - unknown) : - ;; #( - *) : - VISIBILITY_CXXFLAGS=$kpse_cv_visibility_cxxflags - ;; -esac - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index d5b01e35596..c870642c1a5 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner +dnl Copyright (C) 2009-2014 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -28,8 +28,6 @@ m4_include([ac/dvisvgm.ac]) AC_CONFIG_HEADERS([config.h]) -KPSE_COMPILER_VISIBILITY - AC_PROG_CXX AC_PROG_CXXCPP KPSE_CXX_HACK -- cgit v1.2.3