diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-12-04 08:28:33 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-12-04 08:28:33 +0000 |
commit | 82ddcccb08f72ea136dbb4629183a768139fedd6 (patch) | |
tree | 53ac9fd8e27b13b66dbdc4728148f0b5a5d9e34c /Build/source/libs/libpng | |
parent | c9e1e0da596ff4d40901c1b45a9a588c5f929c28 (diff) |
Lua(JIT)TeX: Hide all cairo, gmp, libpng, mpfr, pixman, poppler, zlib, and zziplib symbols
git-svn-id: svn://tug.org/texlive/trunk@35734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng')
-rw-r--r-- | Build/source/libs/libpng/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/libpng/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/libpng/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/libpng/configure | 51 | ||||
-rw-r--r-- | Build/source/libs/libpng/configure.ac | 4 | ||||
-rw-r--r-- | Build/source/libs/libpng/include/Makefile.in | 2 |
7 files changed, 66 insertions, 3 deletions
diff --git a/Build/source/libs/libpng/ChangeLog b/Build/source/libs/libpng/ChangeLog index 4df526a348c..f9933c35519 100644 --- a/Build/source/libs/libpng/ChangeLog +++ b/Build/source/libs/libpng/ChangeLog @@ -1,3 +1,8 @@ +2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Added KPSE_COMPILER_VISIBILITY. + * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS). + 2014-11-21 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpng-1.6.15. diff --git a/Build/source/libs/libpng/Makefile.am b/Build/source/libs/libpng/Makefile.am index 788ea70edc6..35b76dc7006 100644 --- a/Build/source/libs/libpng/Makefile.am +++ b/Build/source/libs/libpng/Makefile.am @@ -28,7 +28,7 @@ dist-hook: SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) -AM_CFLAGS = $(WARNING_CFLAGS) +AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES=libpng.a diff --git a/Build/source/libs/libpng/Makefile.in b/Build/source/libs/libpng/Makefile.in index bc059db68d8..d5b6c7ac282 100644 --- a/Build/source/libs/libpng/Makefile.in +++ b/Build/source/libs/libpng/Makefile.in @@ -95,6 +95,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac @@ -502,6 +503,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ @@ -551,7 +553,7 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES SUBDIRS = . include AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES) -AM_CFLAGS = $(WARNING_CFLAGS) +AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES = libpng.a nodist_libpng_a_SOURCES = \ @LIBPNG_TREE@/png.c \ diff --git a/Build/source/libs/libpng/aclocal.m4 b/Build/source/libs/libpng/aclocal.m4 index 9db986d04fd..ad0c53db51b 100644 --- a/Build/source/libs/libpng/aclocal.m4 +++ b/Build/source/libs/libpng/aclocal.m4 @@ -1184,5 +1184,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../../m4/kpse-common.m4]) +m4_include([../../m4/kpse-visibility.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure index 638554078c2..2eeb27b362c 100755 --- a/Build/source/libs/libpng/configure +++ b/Build/source/libs/libpng/configure @@ -638,6 +638,7 @@ POW_LIB EGREP GREP CPP +VISIBILITY_CFLAGS LN_S RANLIB WARNING_CFLAGS @@ -4834,6 +4835,56 @@ $as_echo "no, using $LN_S" >&6; } fi +{ $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 <stdio.h> + 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 + + + + + ac_config_headers="$ac_config_headers config.h" diff --git a/Build/source/libs/libpng/configure.ac b/Build/source/libs/libpng/configure.ac index f7847972e30..8c815a8d753 100644 --- a/Build/source/libs/libpng/configure.ac +++ b/Build/source/libs/libpng/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 <tex-live@tug.org> +dnl Copyright (C) 2009-2014 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, @@ -19,6 +19,8 @@ AC_PROG_CC AC_PROG_RANLIB AC_PROG_LN_S +KPSE_COMPILER_VISIBILITY + AC_CONFIG_HEADERS([config.h]) # Checks for header files. diff --git a/Build/source/libs/libpng/include/Makefile.in b/Build/source/libs/libpng/include/Makefile.in index 20858230cc0..9274414f9ca 100644 --- a/Build/source/libs/libpng/include/Makefile.in +++ b/Build/source/libs/libpng/include/Makefile.in @@ -80,6 +80,7 @@ DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \ subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/version.ac $(top_srcdir)/configure.ac @@ -161,6 +162,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ ZLIB_DEPEND = @ZLIB_DEPEND@ ZLIB_INCLUDES = @ZLIB_INCLUDES@ |