android/experiments/DocumentLoader/Makefile | 10 ++++++++++
redland/raptor/makefile.mk | 4 ++++
redland/raptor/raptor-1.4.18.patch.no-soname | 11 +++++++++++
redland/rasqal/makefile.mk | 3 +++
redland/rasqal/rasqal-0.9.16.patch.no-soname | 11 +++++++++++
redland/redland/makefile.mk | 3 +++
redland/redland/redland-1.0.8.patch.no-soname | 11 +++++++++++
7 files changed, 53 insertions(+)
New commits:
commit 34592de6135e88ccf0172229b55c864584ac9fa9
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Apr 10 12:52:55 2012 +0300
More libraries
diff --git a/android/experiments/DocumentLoader/Makefile
b/android/experiments/DocumentLoader/Makefile
index 0c1e666..5dea15a 100644
--- a/android/experiments/DocumentLoader/Makefile
+++ b/android/experiments/DocumentLoader/Makefile
@@ -52,6 +52,8 @@ copy-stuff:
comphelpgcc3 \
datelo \
dbaxmllo \
+ dbtoolslo \
+ evtattlo \
expwrap.uno \
fastsax.uno \
fileacc \
@@ -60,6 +62,7 @@ copy-stuff:
foruilo \
freetype \
frmlo \
+ fsstorage.uno \
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
@@ -77,6 +80,7 @@ copy-stuff:
jvmaccessgcc3 \
jvmfwk \
lo-bootstrap \
+ localebe1.uno \
localedata_en \
localedata_others \
lwpftlo \
@@ -84,6 +88,9 @@ copy-stuff:
msfilterlo \
msworkslo \
ooxlo \
+ raptor \
+ rasqal \
+ rdf \
reflection.uno \
reg \
saxlo \
@@ -108,6 +115,7 @@ copy-stuff:
uno_sal \
uno_salhelpergcc3 \
uno_cppuhelpergcc3 \
+ unordflo \
unoxmllo \
utllo \
vbahelperlo \
@@ -118,6 +126,8 @@ copy-stuff:
xml2 \
xmlfdlo \
xmlreader \
+ xmlsecurity \
+ xslt \
xstor \
); do \
$(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
commit ed1db9186336e11de293b9c74c08e0284e8a1702
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Apr 10 12:33:59 2012 +0300
No sonames on Android
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index a2a3bd3..54a46ab 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 0000000..66d1eff
--- /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 6f356db..dabaf78 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 0000000..08c54ac
--- /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 4644611..1eeeba0 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 0000000..224a704
--- /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~
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
