72dfa7ec4c
Change-Id: I2b13aceffd9932978c98c49bc688bd5f71690523 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128035 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
157 lines
8.7 KiB
Groff
157 lines
8.7 KiB
Groff
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
|
|
@@ -9386,7 +9386,7 @@
|
|
case $host_cpu in
|
|
powerpc)
|
|
# see comment about AmigaOS4 .so support
|
|
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib'
|
|
archive_expsym_cmds=''
|
|
;;
|
|
m68k)
|
|
@@ -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
|
|
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -9436,7 +9436,7 @@
|
|
;;
|
|
|
|
haiku*)
|
|
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib'
|
|
link_all_deplibs=yes
|
|
;;
|
|
|
|
@@ -9531,13 +9531,13 @@
|
|
*Sun\ F*) # Sun Fortran 8.3
|
|
tmp_sharedflag='-G' ;;
|
|
esac
|
|
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
|
|
|
|
if test yes = "$supports_anon_versioning"; then
|
|
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
|
|
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
|
echo "local: *; };" >> $output_objdir/$libname.ver~
|
|
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
|
|
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
|
|
fi
|
|
|
|
case $cc_basename in
|
|
@@ -9567,8 +9567,8 @@
|
|
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
|
|
wlarc=
|
|
else
|
|
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
fi
|
|
;;
|
|
|
|
@@ -9586,8 +9586,8 @@
|
|
|
|
_LT_EOF
|
|
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -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'
|
|
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -9633,8 +9633,8 @@
|
|
|
|
*)
|
|
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
|
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags -o $lib'
|
|
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
|
else
|
|
ld_shlibs=no
|
|
fi
|
|
@@ -9937,7 +9937,7 @@
|
|
case $host_cpu in
|
|
powerpc)
|
|
# see comment about AmigaOS4 .so support
|
|
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
|
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $lib'
|
|
archive_expsym_cmds=''
|
|
;;
|
|
m68k)
|
|
@@ -10207,7 +10207,7 @@
|
|
|
|
irix5* | irix6* | nonstopux*)
|
|
if test yes = "$GCC"; then
|
|
- 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'
|
|
+ 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'
|
|
# 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.
|
|
@@ -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'
|
|
@@ -10332,7 +10332,7 @@
|
|
osf3*)
|
|
if test yes = "$GCC"; then
|
|
allow_undefined_flag=' $wl-expect_unresolved $wl\*'
|
|
- 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'
|
|
+ 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'
|
|
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'
|
|
@@ -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\*'
|
|
- 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'
|
|
+ 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'
|
|
hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
|
|
else
|
|
allow_undefined_flag=' -expect_unresolved \*'
|
|
@@ -13620,10 +13620,10 @@
|
|
XX_CFLAGS="-Wall"
|
|
case "$host" in
|
|
*-*-mingw*)
|
|
- XX_ANSIFLAGS="-pedantic"
|
|
+ XX_ANSIFLAGS=""
|
|
;;
|
|
*-*-aix*)
|
|
- XX_ANSIFLAGS="-pedantic"
|
|
+ XX_ANSIFLAGS=""
|
|
;;
|
|
*)
|
|
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_nop
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|