diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-05 13:08:42 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-05 17:53:02 +0200 |
commit | c8bab278bb2ee9b27b5e8181100cb23dcf5a975c (patch) | |
tree | ff68e22214e94c3c48e5400288a021c8bd2bc5c1 | |
parent | d49cdfddf8514eb1d63b589af70b456524eb0e0b (diff) |
Don't use soname, Android doesn't support that
-rw-r--r-- | fontconfig/fontconfig-2.8.0.patch | 9 | ||||
-rw-r--r-- | freetype/freetype-2.4.8.patch | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index 5b5cdcef5b68..2185d2eabd7e 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -20,6 +20,15 @@ | -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~ @@ -14073,7 +14073,7 @@ no) ;; diff --git a/freetype/freetype-2.4.8.patch b/freetype/freetype-2.4.8.patch index 0318919e42c6..9ae69a3a6b45 100644 --- a/freetype/freetype-2.4.8.patch +++ b/freetype/freetype-2.4.8.patch @@ -9,3 +9,12 @@ else case "$host" in *-dec-osf*) +@@ -10039,7 +10039,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~ |