diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-10-03 15:21:15 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-03 20:26:25 +0300 |
| commit | 78c7bbc3ce92493ca98c605f92733e31ad87ef70 (patch) | |
| tree | d9853353588bdbe58a1622931ec8f2796efd4cfe /fontconfig | |
| parent | 78225f2ebeb30c853395240f7cc87926349aa975 (diff) | |
Use different symbol names in the two expat variants we build
We need to be able to link both into one binary in the
disable-dynloading case.
Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fontconfig-2.8.0.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index a75648a49ba2..63511fb0c7eb 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -20,6 +20,26 @@ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/fontconfig-2.8.0/configure +++ misc/build/fontconfig-2.8.0/configure +@@ -14368,7 +14368,7 @@ + ;; + yes) + +-for ac_func in XML_SetDoctypeDeclHandler ++for ac_func in XML_SetDoctypeDeclHandler_UTF8 + do + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +@@ -14468,7 +14468,7 @@ + fi + done + +- case "$ac_cv_func_XML_SetDoctypeDeclHandler" in ++ case "$ac_cv_func_XML_SetDoctypeDeclHandler_UTF8" in + yes) + HAVE_EXPAT=1 + +--- 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' ;; |