summaryrefslogtreecommitdiff
path: root/Build/source/libs/pixman
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-04 08:28:33 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-04 08:28:33 +0000
commit82ddcccb08f72ea136dbb4629183a768139fedd6 (patch)
tree53ac9fd8e27b13b66dbdc4728148f0b5a5d9e34c /Build/source/libs/pixman
parentc9e1e0da596ff4d40901c1b45a9a588c5f929c28 (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/pixman')
-rw-r--r--Build/source/libs/pixman/ChangeLog5
-rw-r--r--Build/source/libs/pixman/Makefile.am1
-rw-r--r--Build/source/libs/pixman/Makefile.in3
-rw-r--r--Build/source/libs/pixman/aclocal.m41
-rwxr-xr-xBuild/source/libs/pixman/configure51
-rw-r--r--Build/source/libs/pixman/configure.ac2
-rw-r--r--Build/source/libs/pixman/include/Makefile.in2
-rw-r--r--Build/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols12
-rw-r--r--Build/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h2
10 files changed, 82 insertions, 1 deletions
diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog
index 0125498b2ca..eb2e493282c 100644
--- a/Build/source/libs/pixman/ChangeLog
+++ b/Build/source/libs/pixman/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-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import pixman-0.32.6.
diff --git a/Build/source/libs/pixman/Makefile.am b/Build/source/libs/pixman/Makefile.am
index 84a1809852e..31b89f47550 100644
--- a/Build/source/libs/pixman/Makefile.am
+++ b/Build/source/libs/pixman/Makefile.am
@@ -25,6 +25,7 @@ dist-hook:
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libpixman.a
diff --git a/Build/source/libs/pixman/Makefile.in b/Build/source/libs/pixman/Makefile.in
index 74672c015b4..d93c4474a22 100644
--- a/Build/source/libs/pixman/Makefile.in
+++ b/Build/source/libs/pixman/Makefile.in
@@ -98,6 +98,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-size-max.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) \
@@ -528,6 +529,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@
@@ -575,6 +577,7 @@ EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libpixman.a
libpixman_sources = \
@PIXMAN_TREE@/pixman/pixman.c \
diff --git a/Build/source/libs/pixman/aclocal.m4 b/Build/source/libs/pixman/aclocal.m4
index 68edc2b237b..0ebf296045d 100644
--- a/Build/source/libs/pixman/aclocal.m4
+++ b/Build/source/libs/pixman/aclocal.m4
@@ -1186,4 +1186,5 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-size-max.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
diff --git a/Build/source/libs/pixman/configure b/Build/source/libs/pixman/configure
index 8679ff232ec..1f1784f974c 100755
--- a/Build/source/libs/pixman/configure
+++ b/Build/source/libs/pixman/configure
@@ -629,6 +629,7 @@ LIBOBJS
PIXMAN_TREE
build_FALSE
build_TRUE
+VISIBILITY_CFLAGS
EGREP
GREP
CPP
@@ -5584,6 +5585,56 @@ _ACEOF
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 <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/pixman/configure.ac b/Build/source/libs/pixman/configure.ac
index 4f54aa8c4cc..7291f504530 100644
--- a/Build/source/libs/pixman/configure.ac
+++ b/Build/source/libs/pixman/configure.ac
@@ -29,6 +29,8 @@ AC_CHECK_FUNCS([getisax])
AC_C_BIGENDIAN
AC_C_INLINE
+KPSE_COMPILER_VISIBILITY
+
AC_CONFIG_HEADERS([config.h])
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
diff --git a/Build/source/libs/pixman/include/Makefile.in b/Build/source/libs/pixman/include/Makefile.in
index f9666692057..034802af228 100644
--- a/Build/source/libs/pixman/include/Makefile.in
+++ b/Build/source/libs/pixman/include/Makefile.in
@@ -82,6 +82,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-size-max.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) \
@@ -163,6 +164,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/pixman/pixman-0.32.6-PATCHES/ChangeLog b/Build/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
index b49f74809d2..fa46f564777 100644
--- a/Build/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
+++ b/Build/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-hide-symbols (new): Allow to hide all symbols.
+
2014-07-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import pixman-0.32.6.
diff --git a/Build/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols b/Build/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
new file mode 100644
index 00000000000..dfcd5bf86ce
--- /dev/null
+++ b/Build/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
@@ -0,0 +1,12 @@
+diff -ur pixman-0.32.6.orig/pixman/pixman-compiler.h pixman-0.32.6/pixman/pixman-compiler.h
+--- pixman-0.32.6.orig/pixman/pixman-compiler.h 2014-04-24 06:34:14.000000000 +0200
++++ pixman-0.32.6/pixman/pixman-compiler.h 2014-12-04 08:34:52.000000000 +0100
+@@ -91,7 +91,7 @@
+
+ /* GCC visibility */
+ #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
+-# define PIXMAN_EXPORT __attribute__ ((visibility("default")))
++# define PIXMAN_EXPORT
+ /* Sun Studio 8 visibility */
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+ # define PIXMAN_EXPORT __global
diff --git a/Build/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h b/Build/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
index 2489adc38e0..eb97acdbd0c 100644
--- a/Build/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
+++ b/Build/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
@@ -91,7 +91,7 @@
/* GCC visibility */
#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
-# define PIXMAN_EXPORT __attribute__ ((visibility("default")))
+# define PIXMAN_EXPORT
/* Sun Studio 8 visibility */
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define PIXMAN_EXPORT __global