diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-04-10 12:33:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-04-10 12:53:40 +0300 |
| commit | ed1db9186336e11de293b9c74c08e0284e8a1702 (patch) | |
| tree | 58cae02b535cf8caedfc53ff72c45e00db686426 /redland | |
| parent | 9bbc7cf94a05ce71c34421816005fae1692fb5bd (diff) | |
No sonames on Android
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 4 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.no-soname | 11 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 3 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.no-soname | 11 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 3 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.patch.no-soname | 11 |
6 files changed, 43 insertions, 0 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index a2a3bd36e85f..54a46ab386ca 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -75,6 +75,10 @@ PATCH_FILES+=raptor-1.4.18.libxml.patch PATCH_FILES+=raptor-1.4.18.libxslt.patch .ENDIF +.IF "$(OS)"=="ANDROID" +PATCH_FILES+=$(TARFILE_NAME).patch.no-soname +.ENDIF + .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw diff --git a/redland/raptor/raptor-1.4.18.patch.no-soname b/redland/raptor/raptor-1.4.18.patch.no-soname new file mode 100644 index 000000000000..66d1effa64cf --- /dev/null +++ b/redland/raptor/raptor-1.4.18.patch.no-soname @@ -0,0 +1,11 @@ +--- misc/raptor-1.4.18/configure ++++ misc/build/raptor-1.4.18/configure +@@ -7848,7 +7848,7 @@ + *) + tmp_sharedflag='-shared' ;; + 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 $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 6f356dbaabba..dabaf78c7add 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -61,6 +61,9 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) +.IF "$(OS)"=="ANDROID" +PATCH_FILES+=$(TARFILE_NAME).patch.no-soname +.ENDIF .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/rasqal/rasqal-0.9.16.patch.no-soname b/redland/rasqal/rasqal-0.9.16.patch.no-soname new file mode 100644 index 000000000000..08c54acfe5ab --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.no-soname @@ -0,0 +1,11 @@ +--- misc/rasqal-0.9.16/configure ++++ misc/build/rasqal-0.9.16/configure +@@ -7848,7 +7848,7 @@ + *) + tmp_sharedflag='-shared' ;; + 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 $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 4644611b824f..1eeeba0257ef 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -61,6 +61,9 @@ OOO_PATCH_FILES= \ PATCH_FILES=$(OOO_PATCH_FILES) \ +.IF "$(OS)"=="ANDROID" +PATCH_FILES+=$(TARFILE_NAME).patch.no-soname +.ENDIF .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/redland/redland-1.0.8.patch.no-soname b/redland/redland/redland-1.0.8.patch.no-soname new file mode 100644 index 000000000000..224a7046f817 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.no-soname @@ -0,0 +1,11 @@ +--- misc/redland-1.0.8/configure ++++ misc/build/redland-1.0.8/configure +@@ -7848,7 +7848,7 @@ + *) + tmp_sharedflag='-shared' ;; + 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 $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ |