diff options
Diffstat (limited to 'external/freetype/freetype-2.6.5.patch.1')
-rw-r--r-- | external/freetype/freetype-2.6.5.patch.1 | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/external/freetype/freetype-2.6.5.patch.1 b/external/freetype/freetype-2.6.5.patch.1 index a9c231cbe384..c10c0bb38ea8 100644 --- a/external/freetype/freetype-2.6.5.patch.1 +++ b/external/freetype/freetype-2.6.5.patch.1 @@ -1,7 +1,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure --- freetype/builds/unix/configure.dt 2017-02-01 22:14:45.206257952 +0100 +++ freetype/builds/unix/configure 2017-02-01 22:16:31.076183707 +0100 -@@ -8858,7 +8858,7 @@ +@@ -9386,7 +9386,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support @@ -10,7 +10,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure archive_expsym_cmds='' ;; m68k) -@@ -8874,7 +8874,7 @@ +@@ -9402,7 +9402,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach <jrb3@best.com> says some releases of gcc # support --undefined. This deserves some investigation. FIXME @@ -19,7 +19,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else ld_shlibs=no fi -@@ -8908,7 +8908,7 @@ +@@ -9436,7 +9436,7 @@ ;; haiku*) @@ -28,7 +28,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure link_all_deplibs=yes ;; -@@ -9003,13 +9003,13 @@ +@@ -9531,13 +9531,13 @@ *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac @@ -44,7 +44,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure fi case $cc_basename in -@@ -9039,8 +9039,8 @@ +@@ -9567,8 +9567,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else @@ -55,7 +55,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure fi ;; -@@ -9058,8 +9058,8 @@ +@@ -9586,8 +9586,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -66,7 +66,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else ld_shlibs=no fi -@@ -9087,8 +9087,8 @@ +@@ -9615,8 +9615,8 @@ # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' @@ -77,7 +77,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else ld_shlibs=no fi -@@ -9105,8 +9105,8 @@ +@@ -9633,8 +9633,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then @@ -88,7 +88,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else ld_shlibs=no fi -@@ -9405,7 +9405,7 @@ +@@ -9937,7 +9937,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support @@ -97,7 +97,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure archive_expsym_cmds='' ;; m68k) -@@ -9674,7 +9674,7 @@ +@@ -10207,7 +10207,7 @@ irix5* | irix6* | nonstopux*) if test yes = "$GCC"; then @@ -106,16 +106,16 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. -@@ -9702,7 +9702,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 - $as_echo "$lt_cv_irix_exported_symbol" >&6; } +@@ -10237,7 +10237,7 @@ + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 + printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -@@ -9797,7 +9797,7 @@ +@@ -10332,7 +10332,7 @@ osf3*) if test yes = "$GCC"; then allow_undefined_flag=' $wl-expect_unresolved $wl\*' @@ -124,7 +124,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure else allow_undefined_flag=' -expect_unresolved \*' archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' -@@ -9810,7 +9810,7 @@ +@@ -10345,7 +10345,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test yes = "$GCC"; then allow_undefined_flag=' $wl-expect_unresolved $wl\*' @@ -133,7 +133,7 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' -@@ -13143,10 +13143,10 @@ +@@ -13620,10 +13620,10 @@ XX_CFLAGS="-Wall" case "$host" in *-*-mingw*) @@ -145,14 +145,13 @@ diff -up freetype/builds/unix/configure.dt freetype/builds/unix/configure + XX_ANSIFLAGS="" ;; *) - GCC_VERSION=`$CC -dumpversion` -@@ -13195,7 +13195,7 @@ - if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5 - $as_echo "ok, adding to XX_ANSIFLAGS" >&6; } + XX_ANSIFLAGS="" +@@ -13661,7 +13661,7 @@ + then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok, adding to XX_ANSIFLAGS" >&5 + printf "%s\n" "ok, adding to XX_ANSIFLAGS" >&6; } - XX_ANSIFLAGS="${XX_ANSIFLAGS} ${a}" + XX_ANSIFLAGS="${XX_ANSIFLAGS}" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -diff -up freetype/configure.dt freetype/configure + else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 |