--- misc/build/fontconfig-2.8.0/config.sub +++ misc/build/fontconfig-2.8.0/config.sub @@ -120,7 +120,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + nto-qnx* | linux-android* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -1272,7 +1272,7 @@ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -android* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/fontconfig-2.8.0/configure +++ misc/build/fontconfig-2.8.0/configure @@ -8718,7 +8718,7 @@ *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 "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ --- misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h +++ misc/build/fontconfig-2.8.0/fontconfig/fontconfig.h @@ -113,9 +113,9 @@ #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */ #define FC_LCD_FILTER "lcdfilter" /* Int */ -#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION -#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION -#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION +#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION +#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION +#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION /* Adjust outline rasterizer */ #define FC_CHAR_WIDTH "charwidth" /* Int */ --- misc/build/fontconfig-2.8.0/src/fcxml.c +++ misc/build/fontconfig-2.8.0/src/fcxml.c @@ -1123,6 +1123,7 @@ * Have to swap the decimal point to match the current locale * if that locale doesn't use 0x2e */ +#ifndef __ANDROID__ if ((dot = strchr (s, 0x2e)) && (locale_data = localeconv ()) && (locale_data->decimal_point[0] != 0x2e || @@ -1158,6 +1158,7 @@ } } else +#endif v = strtod (s, end); return v; } ro/collabora/co-24.04.4'>distro/collabora/co-24.04.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/external/libmspub/ExternalProject_libmspub.mk
AgeCommit message (Expand)Author
2015-09-01core: fix build with system boost 1.59David Ostrovsky
2015-08-11gbuild/config stop using VERBOSE, use only verbose=tNorbert Thiebaud
2014-12-19libmspub depends on zlibChristian Lohmaier
2014-11-13More passing of MAKE into external configureStephan Bergmann
2014-11-10external: fortunately boost no longer requires config_host.mkMichael Stahl
2014-08-29Simplify some $ENABLE_DEBUG expressionsStephan Bergmann
2014-08-29Pass --enable-debug also down to external/libmspubStephan Bergmann
2014-05-26rebase all import libsDavid Tardon
2014-02-27normalize values of CROSS_COMPILINGMichael Stahl
2014-02-12normalize values of SYSTEM_BOOSTMichael Stahl