From 999e823abf1a1539de5e0d32863d9b53fc0fefe2 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 21 Mar 2013 08:24:29 +0000 Subject: pixman: Portability fix for Solaris 9 (undefined SIZE_MAX) Revert r29442 and define it via configure (avoiding to patch sources) git-svn-id: svn://tug.org/texlive/trunk@29451 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/pixman/ChangeLog | 4 + Build/source/libs/pixman/config.h.in | 3 + Build/source/libs/pixman/configure | 102 +++++++++++---------- Build/source/libs/pixman/configure.ac | 7 +- .../libs/pixman/pixman-0.28.0-PATCHES/ChangeLog | 6 -- .../libs/pixman/pixman-0.28.0-PATCHES/TL-Changes | 2 - .../pixman/pixman-0.28.0-PATCHES/patch-01-size_max | 13 --- .../pixman/pixman-0.28.0/pixman/pixman-utils.c | 2 +- 8 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max (limited to 'Build/source/libs') diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 228e8f3446a..a34a459f661 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,7 @@ +2013-03-21 Peter Breitenlohner + + * configure.ac: Define SIZE_MAX if necessary (for Solaris 9). + 2013-01-29 Peter Breitenlohner * Makefile.am, sources.am: Allow subdir-objects. diff --git a/Build/source/libs/pixman/config.h.in b/Build/source/libs/pixman/config.h.in index fd20edbf90a..ccf96fe33d0 100644 --- a/Build/source/libs/pixman/config.h.in +++ b/Build/source/libs/pixman/config.h.in @@ -70,6 +70,9 @@ /* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG +/* Define to `((size_t)-1)' if does not define it. */ +#undef SIZE_MAX + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/Build/source/libs/pixman/configure b/Build/source/libs/pixman/configure index b121559c5e7..f1656ecd643 100755 --- a/Build/source/libs/pixman/configure +++ b/Build/source/libs/pixman/configure @@ -1779,6 +1779,52 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -1961,52 +2007,6 @@ rm -f conftest.val as_fn_set_status $ac_retval } # ac_fn_c_compute_int - -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -12618,6 +12618,16 @@ fi +ac_fn_c_check_decl "$LINENO" "SIZE_MAX" "ac_cv_have_decl_SIZE_MAX" "$ac_includes_default" +if test "x$ac_cv_have_decl_SIZE_MAX" = xyes; then : + +else + +$as_echo "#define SIZE_MAX /**/" >>confdefs.h + +fi + + WERROR= for w in -Werror -errwarn; do if test "z$WERROR" = "z"; then diff --git a/Build/source/libs/pixman/configure.ac b/Build/source/libs/pixman/configure.ac index 0df25e36d8d..01bff6e8396 100644 --- a/Build/source/libs/pixman/configure.ac +++ b/Build/source/libs/pixman/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012 Peter Breitenlohner +dnl Copyright (C) 2012, 2013 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -89,6 +89,11 @@ AC_DEFUN([PIXMAN_LINK_WITH_ENV],[dnl LIBS="$save_LIBS" ]) +dnl Define SIZE_MAX if necessary, e.g., for Solaris 9. +AC_CHECK_DECL([SIZE_MAX], , + [AC_DEFINE([SIZE_MAX], , + [Define to `((size_t)-1)' if does not define it.])]) + dnl Find a -Werror for catching warnings. WERROR= for w in -Werror -errwarn; do diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog index 96d4fa3bdaa..ca5b18c6699 100644 --- a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog +++ b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/ChangeLog @@ -1,9 +1,3 @@ -2013-03-20 Taco Hoekwater - - Created and applied patch-01-size_max for portability - to Solaris 9. - 2012-11-10 Taco Hoekwater Import pixman-0.28.0 - diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes index 54032d4da77..595816d643a 100644 --- a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes +++ b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/TL-Changes @@ -18,5 +18,3 @@ Removed unused dirs: demos test -Applied patch: - patch-01-size_max diff --git a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max b/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max deleted file mode 100644 index 7aa6b403f39..00000000000 --- a/Build/source/libs/pixman/pixman-0.28.0-PATCHES/patch-01-size_max +++ /dev/null @@ -1,13 +0,0 @@ -diff -u pixman-0.28.0.orig/pixman/pixman-utils.c pixman-0.28.0/pixman/pixman-utils.c -=================================================================== ---- pixman-0.28.0.orig/pixman/pixman-utils.c -+++ pixman-0.28.0/pixman/pixman-utils.c -@@ -33,7 +33,7 @@ - pixman_bool_t - _pixman_multiply_overflows_size (size_t a, size_t b) - { -- return a >= SIZE_MAX / b; -+ return a >= ((size_t)-1) / b; - } - - pixman_bool_t diff --git a/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c b/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c index 5ecbede4b47..b1e9fb62db2 100644 --- a/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c +++ b/Build/source/libs/pixman/pixman-0.28.0/pixman/pixman-utils.c @@ -33,7 +33,7 @@ pixman_bool_t _pixman_multiply_overflows_size (size_t a, size_t b) { - return a >= ((size_t)-1) / b; + return a >= SIZE_MAX / b; } pixman_bool_t -- cgit v1.2.3