diff options
Diffstat (limited to 'Build/source/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/libs/zziplib/configure | 51 | ||||
-rw-r--r-- | Build/source/libs/zziplib/configure.ac | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/include/zzip/Makefile.in | 2 |
7 files changed, 66 insertions, 3 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index 995e618e337..1a40ce7ff9f 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/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-07-11 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Reenable mmap for 32- and 64-bit Windows. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index b2d58e59502..0a15a6ecb84 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -26,7 +26,7 @@ SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS += $(ZZIPLIB_DEFINES) -AM_CFLAGS = $(WARNING_CFLAGS) +AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES=libzzip.a diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 2a9310543a7..f6cce8de7a2 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/zziplib-aligned-access.m4 \ $(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@ @@ -562,7 +564,7 @@ EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ $(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES) -AM_CFLAGS = $(WARNING_CFLAGS) +AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS) noinst_LIBRARIES = libzzip.a nodist_libzzip_a_SOURCES = \ @ZZIPLIB_TREE@/zzip/dir.c \ diff --git a/Build/source/libs/zziplib/aclocal.m4 b/Build/source/libs/zziplib/aclocal.m4 index df7a4354cbc..045726fd96b 100644 --- a/Build/source/libs/zziplib/aclocal.m4 +++ b/Build/source/libs/zziplib/aclocal.m4 @@ -1187,5 +1187,6 @@ m4_include([m4/ac_sys_largefile_sensitive.m4]) m4_include([m4/ax_prefix_config_h.m4]) m4_include([m4/zziplib-aligned-access.m4]) 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/zziplib/configure b/Build/source/libs/zziplib/configure index 83933ff36ea..2674f1c84e5 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -637,6 +637,7 @@ ZZIPLIB_DEFINES EGREP GREP CPP +VISIBILITY_CFLAGS LN_S RANLIB host_os @@ -5103,6 +5104,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 + + + + + # Checks for header files. ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/Build/source/libs/zziplib/configure.ac b/Build/source/libs/zziplib/configure.ac index b6c13707c3f..ba31a4c165b 100644 --- a/Build/source/libs/zziplib/configure.ac +++ b/Build/source/libs/zziplib/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> dnl dnl based on zziplib-0.13.58: dnl Copyright (C) 2009 Guido Draheim <guido@gmx.de> for ZZipLib.SF.net @@ -25,6 +25,8 @@ AC_PROG_CC AC_PROG_RANLIB AC_PROG_LN_S +KPSE_COMPILER_VISIBILITY + # Checks for header files. AC_HEADER_STDC AC_HEADER_DIRENT diff --git a/Build/source/libs/zziplib/include/zzip/Makefile.in b/Build/source/libs/zziplib/include/zzip/Makefile.in index edbeb462e61..02cf02f1279 100644 --- a/Build/source/libs/zziplib/include/zzip/Makefile.in +++ b/Build/source/libs/zziplib/include/zzip/Makefile.in @@ -85,6 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \ $(top_srcdir)/m4/ax_prefix_config_h.m4 \ $(top_srcdir)/m4/zziplib-aligned-access.m4 \ $(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 @@ -163,6 +164,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@ |