1diff -up fontconfig/configure.dt fontconfig/configure 2--- fontconfig/configure.dt 2017-02-01 22:07:29.671668568 +0100 3+++ fontconfig/configure 2017-02-01 22:09:53.335215490 +0100 4@@ -10469,7 +10469,7 @@ _LT_EOF 5 case $host_cpu in 6 powerpc) 7 # see comment about AmigaOS4 .so support 8- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 9+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' 10 archive_expsym_cmds='' 11 ;; 12 m68k) 13@@ -10485,7 +10485,7 @@ _LT_EOF 14 allow_undefined_flag=unsupported 15 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc 16 # support --undefined. This deserves some investigation. FIXME 17- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 18+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags -o $lib' 19 else 20 ld_shlibs=no 21 fi 22@@ -10519,7 +10519,7 @@ _LT_EOF 23 ;; 24 25 haiku*) 26- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 27+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' 28 link_all_deplibs=yes 29 ;; 30 31@@ -10614,13 +10614,13 @@ _LT_EOF 32 *Sun\ F*) # Sun Fortran 8.3 33 tmp_sharedflag='-G' ;; 34 esac 35- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 36+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib' 37 38 if test yes = "$supports_anon_versioning"; then 39 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 40 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 41 echo "local: *; };" >> $output_objdir/$libname.ver~ 42- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' 43+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib' 44 fi 45 46 case $cc_basename in 47@@ -10650,8 +10650,8 @@ _LT_EOF 48 archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 49 wlarc= 50 else 51- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 52- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 53+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' 54+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' 55 fi 56 ;; 57 58@@ -10669,8 +10669,8 @@ _LT_EOF 59 60 _LT_EOF 61 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 62- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 63- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 64+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' 65+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' 66 else 67 ld_shlibs=no 68 fi 69@@ -10698,8 +10698,8 @@ _LT_EOF 70 # requires that you compile everything twice, which is a pain. 71 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 72 hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' 73- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 74- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 75+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' 76+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' 77 else 78 ld_shlibs=no 79 fi 80@@ -10716,8 +10716,8 @@ _LT_EOF 81 82 *) 83 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then 84- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 85- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 86+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib' 87+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib' 88 else 89 ld_shlibs=no 90 fi 91@@ -11016,7 +11016,7 @@ fi 92 case $host_cpu in 93 powerpc) 94 # see comment about AmigaOS4 .so support 95- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 96+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib' 97 archive_expsym_cmds='' 98 ;; 99 m68k) 100@@ -11285,7 +11285,7 @@ fi 101 102 irix5* | irix6* | nonstopux*) 103 if test yes = "$GCC"; then 104- archive_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 -o $lib' 105+ archive_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 -o $lib' 106 # Try to use the -exported_symbol ld option, if it does not 107 # work, assume that -exports_file does not work either and 108 # implicitly export all symbols. 109@@ -11313,7 +11313,7 @@ fi 110 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 111 $as_echo "$lt_cv_irix_exported_symbol" >&6; } 112 if test yes = "$lt_cv_irix_exported_symbol"; then 113- 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' 114+ 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' 115 fi 116 else 117 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' 118@@ -11408,7 +11408,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > 119 osf3*) 120 if test yes = "$GCC"; then 121 allow_undefined_flag=' $wl-expect_unresolved $wl\*' 122- archive_cmds='$CC -shared$allow_undefined_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 -o $lib' 123+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' 124 else 125 allow_undefined_flag=' -expect_unresolved \*' 126 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' 127@@ -11421,7 +11421,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > 128 osf4* | osf5*) # as osf3* with the addition of -msym flag 129 if test yes = "$GCC"; then 130 allow_undefined_flag=' $wl-expect_unresolved $wl\*' 131- archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' 132+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' 133 hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' 134 else 135 allow_undefined_flag=' -expect_unresolved \*' 136