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

Overview Repositories Revisions Requests Users Attributes Meta

File redland-1.0.9-mingw.patch of Package mingw32-redland (Revision 95b980ca2a6fc80d2f8e2d24f04293be)

Currently displaying revision 95b980ca2a6fc80d2f8e2d24f04293be , Show latest

--- redland-1.0.9/src/Makefile.am	2009-04-13 03:01:30.000000000 +0200
+++ redland-1.0.9/src/Makefile.am	2009-07-01 13:20:20.000000000 +0200
@@ -119,32 +119,32 @@
 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_storage_tstore_la_LDFLAGS = -module -avoid-version
+librdf_storage_tstore_la_LIBADD = librdf.la @TSTORE_LIBS@ @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_storage_mysql_la_LDFLAGS = -module -avoid-version
+librdf_storage_mysql_la_LIBADD = librdf.la @MYSQL_LIBS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_mysql_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 if STORAGE_SQLITE
 plugin_LTLIBRARIES += librdf_storage_sqlite.la
 librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
 librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
-librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
-librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
+librdf_storage_sqlite_la_LIBADD = librdf.la @SQLITE_LIBS@ @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_storage_postgresql_la_LDFLAGS = -module -avoid-version
+librdf_storage_postgresql_la_LIBADD = librdf.la @POSTGRESQL_LIBS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
+librdf_storage_postgresql_la_LDFLAGS = -no-undefined -module -avoid-version
 endif
 
 else
@@ -182,7 +182,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.9/src/win32_rdf_config.h	2009-04-08 06:31:14.000000000 +0200
+++ redland-1.0.9/src/win32_rdf_config.h	2009-07-01 10:06:14.000000000 +0200
@@ -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.9/utils/db_upgrade.c	2008-07-01 05:10:25.000000000 +0200
+++ redland-1.0.9/utils/db_upgrade.c	2009-07-01 12:24:12.000000000 +0200
@@ -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.9/utils/Makefile.am	2009-04-08 07:05:25.000000000 +0200
+++ redland-1.0.9/utils/Makefile.am	2009-07-01 13:20:38.000000000 +0200
@@ -23,11 +23,15 @@
 
 redland_db_upgrade_SOURCES = db_upgrade.c
 
+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.9/utils/rdfproc.c	2008-10-13 01:31:29.000000000 +0200
+++ redland-1.0.9/utils/rdfproc.c	2009-07-01 10:07:12.000000000 +0200
@@ -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.9-mingw.patch of Package mingw32-redland (Revision 95b980ca2a6fc80d2f8e2d24f04293be)

Places