File redland-1.0.12-mingw.patch of Package mingw32-redland

Overview Repositories Revisions Requests Users Attributes Meta

File redland-1.0.12-mingw.patch of Package mingw32-redland (Revision 7403c996a783aedf337f876b20d75f0f)

Currently displaying revision 7403c996a783aedf337f876b20d75f0f , Show latest

--- redland-1.0.12/src/Makefile.am	2010-10-11 05:39:47.000000000 +0200
+++ redland-1.0.12/src/Makefile.am	2010-11-26 10:16:13.000000000 +0100
@@ -126,16 +126,16 @@
 plugin_LTLIBRARIES += librdf_storage_tstore.la
 librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
 librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
-librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
-librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
+librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_tstore_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 if STORAGE_MYSQL
 plugin_LTLIBRARIES += librdf_storage_mysql.la
 librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
 librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
-librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
-librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
+librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_mysql_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 if STORAGE_SQLITE
@@ -145,24 +145,24 @@
 # ones for SQLITE headers.  There is no other way to adjust the
 # automake-generated rule to ensure this.
 librdf_storage_sqlite_la_CPPFLAGS = $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @SQLITE_CPPFLAGS@
-librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
-librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
+librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_sqlite_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 if STORAGE_POSTGRESQL
 plugin_LTLIBRARIES += librdf_storage_postgresql.la
 librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
 librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
-librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
-librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
+librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_postgresql_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 if STORAGE_VIRTUOSO
 plugin_LTLIBRARIES += librdf_storage_virtuoso.la 
 librdf_storage_virtuoso_la_SOURCES = rdf_storage_virtuoso.c rdf_query_virtuoso.c rdf_storage_virtuoso_internal.h
 librdf_storage_virtuoso_la_CPPFLAGS = @ODBC_CFLAGS@
-librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la
-librdf_storage_virtuoso_la_LDFLAGS = -module -avoid-version
+librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_virtuoso_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 else
@@ -204,7 +204,7 @@
 EXTRA_DIST=\
 redland.spec redland.spec.in
 
-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
+librdf_la_LDFLAGS = -export-symbols-regex "^librdf_.*" -no-undefined -version-info @LIBRDF_LIBTOOL_VERSION@ \
 @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
 
 pkgdata_DATA=
--- redland-1.0.12/src/win32_rdf_config.h	2010-10-11 04:12:58.000000000 +0200
+++ redland-1.0.12/src/win32_rdf_config.h	2010-11-26 10:14:07.000000000 +0100
@@ -31,6 +31,8 @@
 
 #define WIN32_LEAN_AND_MEAN 1
 
+#ifndef HAVE_CONFIG_H
+
 /* getopt is not in standard win32 C library - define if we have it */
 /* #define HAVE_GETOPT_H 1 */
 
@@ -57,6 +59,8 @@
 /* Define the following if you are calling the librdf from C# or any language which uses stdcall */
 #define USE_STDCALL_CALLBACKS 1
 
+#endif /* HAVE_CONFIG_H */
+
 /* for access() which is POSIX but doesn't seem to have the defines in VC */
 #ifndef R_OK
 #define F_OK 0
@@ -70,6 +74,8 @@
 #define REDLAND_INLINE __inline
 
 
+#ifndef HAVE_CONFIG_H
+
 /* 
  * Defines that come from rdf_config.h
  */
@@ -285,6 +291,7 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+#endif /* HAVE_CONFIG_H */
 
 #include <windows.h>
 #include <io.h>
--- redland-1.0.12/utils/db_upgrade.c	2008-07-01 05:10:25.000000000 +0200
+++ redland-1.0.12/utils/db_upgrade.c	2010-11-26 10:14:07.000000000 +0100
@@ -34,6 +34,7 @@
 /* one prototype needed */
 int main(int argc, char *argv[]);
 
+char* librdf_heuristic_gen_name(const char *name);
 
 
 int
--- redland-1.0.12/utils/Makefile.am	2010-10-11 06:11:08.000000000 +0200
+++ redland-1.0.12/utils/Makefile.am	2010-11-26 10:14:07.000000000 +0100
@@ -30,11 +30,15 @@
 redland_virtuoso_test_SOURCES = redland-virtuoso-test.c
 redland_virtuoso_test_LDADD= @LIBRDF_DIRECT_LIBS@ @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la
 
+redland_db_upgrade_LDADD = $(top_builddir)/src/librdf.la
+
 rdfproc_SOURCES = rdfproc.c
 if GETOPT
 rdfproc_SOURCES += getopt.c rdfproc_getopt.h
 endif
 
+rdfproc_LDADD = $(top_builddir)/src/librdf.la
+
 mysql-utils: $(MYSQL_UTILS)
 
 @MAINT@rdfproc.html: $(srcdir)/rdfproc.1 $(srcdir)/fix-groff-xhtml
--- redland-1.0.12/utils/rdfproc.c	2010-10-14 03:16:25.000000000 +0200
+++ redland-1.0.12/utils/rdfproc.c	2010-11-26 10:14:07.000000000 +0100
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef WIN32
-#include <win32_config.h>
+#include <win32_rdf_config.h>
 #endif
 
 #include <stdio.h>

Places

File redland-1.0.12-mingw.patch of Package mingw32-redland (Revision 7403c996a783aedf337f876b20d75f0f)

Places