File rasqal-0.9.20-mingw.patch of Package mingw32-rasqal

Overview Repositories Revisions Requests Users Attributes Meta

File rasqal-0.9.20-mingw.patch of Package mingw32-rasqal (Revision 568259865e9ec55269bbdbe1bc42f6e8)

Currently displaying revision 568259865e9ec55269bbdbe1bc42f6e8 , Show latest

--- rasqal-0.9.20/configure.ac	2010-08-22 06:34:05.000000000 +0200
+++ rasqal-0.9.20/configure.ac	2010-11-26 00:16:01.000000000 +0100
@@ -478,27 +478,33 @@
 fi
 
 
-AC_MSG_CHECKING(for posix regex library)
+REGEX_LIBS=
 oLIBS="$LIBS"
 if test $ac_cv_header_regex_h = yes; then
+  AC_CHECK_FUNCS(regcomp,,[AC_CHECK_LIB(regex,regcomp,
+                [LIBS="$LIBS -lregex"]
+                [REGEX_LIBS=-lregex],)])
+  AC_MSG_CHECKING(for posix regex library)
   AC_TRY_LINK([#include <sys/types.h>
               #include <regex.h>],
              [regex_t reg; char *pat="abc"; regcomp(&reg, pat, 0);],
              worked=yes, worked=no, worked=no)
   if test $worked = yes; then
+    AC_MSG_RESULT(yes)
     have_regex_posix=1
+  else
+    AC_MSG_RESULT(no)
   fi
 fi
 
 LIBS="$oLIBS"
 
 if test $have_regex_posix = 1; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_REGEX_PCRE, 1, [have PCRE regex - Perl Compatible Regular Expressions])
+  AC_DEFINE(HAVE_REGEX_POSIX, 1, [have posix regex])
 else
-  AC_MSG_RESULT(no)
+  REGEX_LIBS=
 fi
-
+AC_SUBST(REGEX_LIBS)
 
 
 AC_ARG_WITH(regex-library, [  --with-regex-library=NAME   Use regex library - posix, pcre (auto)], regex_library="$withval", regex_library="") 
--- rasqal-0.9.20/src/Makefile.am	2010-08-19 22:34:16.000000000 +0200
+++ rasqal-0.9.20/src/Makefile.am	2010-11-26 00:16:01.000000000 +0100
@@ -102,8 +102,8 @@
 if STRCASECMP
 librasqal_la_SOURCES += strcasecmp.c
 endif
-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
-librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
+librasqal_la_LDFLAGS = -no-undefined -version-info @RASQAL_LIBTOOL_VERSION@
+librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) $(REGEX_LIBS)
 librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
 
 
--- rasqal-0.9.20/src/sparql_parser.h	2010-08-21 21:24:22.000000000 +0200
+++ rasqal-0.9.20/src/sparql_parser.h	2010-11-26 00:21:57.000000000 +0100
@@ -36,6 +36,10 @@
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
+
+#ifdef IN
+#undef IN
+#endif
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    enum yytokentype {
--- rasqal-0.9.20/src/win32_rasqal_config.h	2009-12-14 15:44:50.000000000 +0100
+++ rasqal-0.9.20/src/win32_rasqal_config.h	2010-11-26 00:16:01.000000000 +0100
@@ -32,6 +32,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 */
 
@@ -54,6 +56,8 @@
 
 #define HAVE_C99_VSNPRINTF 1
 
+#endif /* HAVE_CONFIG_H */
+
 /* for access() which is POSIX but doesn't seem to have the defines in VC */
 #ifndef R_OK
 #define R_OK 4
@@ -62,10 +66,14 @@
 /* __func__ doesn't exist in Visual Studio 6 */
 #define __func__ ""
 
+#ifndef HAVE_CONFIG_H
+
 /* 
  * Defines that come from config.h
  */
 
+#endif /* HAVE_CONFIG_H */
+
 #include <windows.h>
 #include <io.h>
 #include <memory.h>
@@ -80,6 +88,10 @@
 #undef ERROR
 #endif
 
+#ifdef DELETE
+#undef DELETE
+#endif
+
 /* flex: const is available */
 #define YY_USE_CONST
 /* looks like the .c files define this anyway */
@@ -88,6 +100,9 @@
 #undef RASQAL_INLINE
 #define RASQAL_INLINE __inline
 
+
+#ifndef HAVE_CONFIG_H
+
 /* Building RDQL query */
 #define RASQAL_QUERY_RDQL 1
 
@@ -103,6 +118,8 @@
 /* Use PCRE regex library */
 #define RASQAL_REGEX_PCRE 1
 
+#endif /* HAVE_CONFIG_H */
+
 #ifdef _DEBUG
 #define RASQAL_DEBUG 1
 #endif
--- rasqal-0.9.20/utils/roqet.c	2010-05-17 07:50:35.000000000 +0200
+++ rasqal-0.9.20/utils/roqet.c	2010-11-26 06:37:24.000000000 +0100
@@ -56,7 +56,7 @@
 
 /* Rasqal includes */
 #include <rasqal.h>
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
 #include <rasqal_internal.h>
 #endif
 
@@ -84,7 +84,7 @@
 #define HELP_PAD "\n      "
 #endif
 
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
 /* add 'g:' */
 #define GETOPT_STRING "cd:D:e:f:g:G:hi:nr:qs:vw"
 #else
@@ -93,7 +93,7 @@
 
 #ifdef HAVE_GETOPT_LONG
 
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
 #define STORE_RESULTS_FLAG 0x100
 #endif
 
@@ -105,7 +105,7 @@
   {"dryrun", 0, 0, 'n'},
   {"exec", 1, 0, 'e'},
   {"feature", 1, 0, 'f'},
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
   {"engine", 1, 0, 'g'},
 #endif
   {"help", 0, 0, 'h'},
@@ -413,7 +413,7 @@
 #ifdef HAVE_RAPTOR2_API
   raptor_world* raptor_world_ptr;
 #endif
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
   int store_results = -1;
   const rasqal_query_execution_factory* engine = NULL;
 #endif
@@ -635,10 +635,18 @@
         if(!access((const char*)optarg, R_OK)) {
           unsigned char* source_uri_string;
           source_uri_string = raptor_uri_filename_to_uri_string((const char*)optarg);
+#ifdef HAVE_RAPTOR2_API
           source_uri = raptor_new_uri(raptor_world_ptr, source_uri_string);
+#else
+          source_uri = raptor_new_uri(source_uri_string);
+#endif
           raptor_free_memory(source_uri_string);
         } else
+#ifdef HAVE_RAPTOR2_API
           source_uri = raptor_new_uri(raptor_world_ptr,
+#else
+          source_uri = raptor_new_uri(
+#endif
                                       (const unsigned char*)optarg);
 
         if(!source_uri) {
@@ -685,7 +693,7 @@
         break;
 #endif
 
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
       case 'g':
         engine = rasqal_query_get_engine_by_name(optarg);
         break;
@@ -799,7 +807,7 @@
       printf("      %-15s         %s\n", query_output_format_labels[i][0],
              query_output_format_labels[i][1]);
     puts(HELP_TEXT("f FEATURE(=VALUE)", "feature FEATURE(=VALUE)", HELP_PAD "Set query features" HELP_PAD "Use `-f help' for a list of valid features"));
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
     puts(HELP_TEXT("g", "engine NAME       ", "INTERNAL: Pick execution engine NAME"));
 #endif
     puts(HELP_TEXT("h", "help              ", "Print this help, then exit"));
@@ -847,7 +855,11 @@
     }
     
     if(uri_string) {
+#ifdef HAVE_RAPTOR2_API
       uri = raptor_new_uri(raptor_world_ptr, uri_string);
+#else
+      uri = raptor_new_uri(uri_string);
+#endif
       if(!uri) {
         fprintf(stderr, "%s: Failed to create URI for %s\n",
                 program, uri_string);
@@ -861,7 +873,11 @@
     if(uri)
       base_uri = raptor_uri_copy(uri);
   } else
+#ifdef HAVE_RAPTOR2_API
     base_uri = raptor_new_uri(raptor_world_ptr, base_uri_string);
+#else
+    base_uri = raptor_new_uri(base_uri_string);
+#endif
   if(base_uri_string && !base_uri) {
     fprintf(stderr, "%s: Failed to create URI for %s\n",
             program, base_uri_string);
@@ -1045,7 +1061,11 @@
     case QUERY_OUTPUT_SPARQL:
       if(1) {
         raptor_iostream* iostr;
+#ifdef HAVE_RAPTOR2_API
         iostr = raptor_new_iostream_to_file_handle(raptor_world_ptr, stdout);
+#else
+        iostr = raptor_new_iostream_to_file_handle(stdout);
+#endif
         rasqal_query_write(iostr, rq, NULL, base_uri);
         raptor_free_iostream(iostr);
       }
@@ -1062,7 +1082,7 @@
   if(dryrun)
     goto tidy_query;
 
-#ifdef RASQAL_INTERNAL
+#if defined(RASQAL_INTERNAL) && !defined(_WIN32)
   results = rasqal_query_execute_with_engine(rq, engine);
 #else
   results = rasqal_query_execute(rq);
@@ -1076,7 +1096,11 @@
 
   if(results_formatter != NULL) {
     raptor_iostream *iostr;
+#ifdef HAVE_RAPTOR2_API
     iostr = raptor_new_iostream_to_file_handle(raptor_world_ptr, stdout);
+#else
+    iostr = raptor_new_iostream_to_file_handle(stdout);
+#endif
     if(!iostr) {
       fprintf(stderr, "%s: Creating output iostream failed\n", program);
       rc = 1;

Places

File rasqal-0.9.20-mingw.patch of Package mingw32-rasqal (Revision 568259865e9ec55269bbdbe1bc42f6e8)

Places