[Libreoffice-commits] .: 2 commits - redland/raptor redland/rasqal redland/redland scp2/source
David Tardon
dtardon at kemper.freedesktop.org
Fri Apr 13 07:31:46 PDT 2012
redland/raptor/makefile.mk | 6 +++++-
redland/raptor/raptor-1.4.18.patch.dmake | 2 +-
redland/raptor/raptor-1.4.18.patch.mingw | 4 ++--
redland/rasqal/makefile.mk | 6 +++++-
redland/rasqal/rasqal-0.9.16.patch.dmake | 2 +-
redland/rasqal/rasqal-0.9.16.patch.mingw | 4 ++--
redland/redland/makefile.mk | 6 +++++-
redland/redland/redland-1.0.8.patch.dmake | 2 +-
redland/redland/redland-1.0.8.patch.mingw | 4 ++--
scp2/source/ooo/file_library_ooo.scp | 12 ++++++------
10 files changed, 30 insertions(+), 18 deletions(-)
New commits:
commit 4d6a36dd0c3c0f61ee8e80f748dd6d8ec2cebbd5
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 13 16:24:16 2012 +0200
renaming dlls makes little sense on windows
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3d25291..0229bf8 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,8 +59,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.win32 \
$(TARFILE_NAME).patch.rindex \
raptor-aix.patch \
- $(TARFILE_NAME).entities.patch \
+ $(TARFILE_NAME).entities.patch
+
+.IF "$(GUI)" == "UNX"
+OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
+.ENDIF
.IF "$(CROSS_COMPILING)"=="YES"
OOO_PATCH_FILES += \
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw
index b671e4d..bb9f6f4 100644
--- a/redland/raptor/raptor-1.4.18.patch.mingw
+++ b/redland/raptor/raptor-1.4.18.patch.mingw
@@ -34,8 +34,8 @@
$(am__append_20) $(am__append_21) $(am__append_22) \
$(am__append_23) $(am__append_24) $(am__append_25) \
$(am__append_26)
--libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -no-undefined
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
libraptor_la_LIBADD = @LTLIBOBJS@
EXTRA_DIST = \
raptor-config.in \
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 764993c..fb0dce7 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
- rasqal-aix.patch \
+ rasqal-aix.patch
+
+.IF "$(GUI)" == "UNX"
+OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
+.ENDIF
PATCH_FILES=$(OOO_PATCH_FILES)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.patch.mingw
index 459ed46..9c42a98 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.mingw
+++ b/redland/rasqal/rasqal-0.9.16.patch.mingw
@@ -4,8 +4,8 @@
rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
$(am__append_4) $(am__append_5)
--librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo
-+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo -no-undefined
+-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
EXTRA_DIST = \
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index cf7639f..5bec90f 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.win32 \
- redland-aix.patch \
+ redland-aix.patch
+
+.IF "$(GUI)" == "UNX"
+OOO_PATCH_FILES+= \
$(TARFILE_NAME).patch.bundled-soname
+.ENDIF
PATCH_FILES=$(OOO_PATCH_FILES) \
diff --git a/redland/redland/redland-1.0.8.patch.mingw b/redland/redland/redland-1.0.8.patch.mingw
index aeddac8..a32621b 100644
--- a/redland/redland/redland-1.0.8.patch.mingw
+++ b/redland/redland/redland-1.0.8.patch.mingw
@@ -4,8 +4,8 @@
rdf_parser_raptor.c
EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
--librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \
-+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo -no-undefined \
+-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
@LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
pkgdata_DATA = $(am__append_11)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6673568..1f3b605 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1573,9 +1573,9 @@ File gid_File_Lib_Raptor
#endif
#else
#ifdef _gcc3
- Name = "libraptor-lo-1.dll";
+ Name = "libraptor-1.dll";
#else
- Name = "raptor-lo.dll";
+ Name = "raptor.dll";
#endif
#endif
End
@@ -1592,9 +1592,9 @@ File gid_File_Lib_Rasqal
#endif
#else
#ifdef _gcc3
- Name = STRING(CONCAT3(librasqal-lo-,RASQAL_MAJOR,.dll));
+ Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
#else
- Name = "rasqal-lo.dll";
+ Name = "rasqal.dll";
#endif
#endif
End
@@ -1611,9 +1611,9 @@ File gid_File_Lib_Rdf
#endif
#else
#ifdef _gcc3
- Name = "librdf-lo-0.dll";
+ Name = "librdf-0.dll";
#else
- Name = "librdf-lo.dll";
+ Name = "librdf.dll";
#endif
#endif
End
commit 370e3b6d6031aba675b66ed7495505f605c41779
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 13 16:10:58 2012 +0200
Revert "change redland dllnames on windows too"
This reverts commit 6bc4d28845db8d63faeaa9eac4ce7364f37e4d2e.
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
index c81ed83..b017275 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -104,7 +104,7 @@
+SHL1USE_EXPORTS=name
+
+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)-lo
++SHL1TARGET= $(TARGET)
+SHL1IMPLIB= lib$(TARGET)
+
+#SHL1VERSIONMAP=../service/exports.map
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index 9d36867..6795eb9 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -78,7 +78,7 @@
+SHL1USE_EXPORTS=name
+
+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)-lo
++SHL1TARGET= $(TARGET)
+SHL1IMPLIB= lib$(TARGET)
+
+#SHL1VERSIONMAP=../service/exports.map
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index 2611fb1..34ba51d 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -92,7 +92,7 @@
+SHL1OBJS= $(SLOFILES)
+
+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)-lo
++SHL1TARGET= $(TARGET)
+SHL1IMPLIB= $(TARGET)
+SHL1USE_EXPORTS=name
+
More information about the Libreoffice-commits
mailing list