summaryrefslogtreecommitdiff
path: root/redland
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-01 10:46:37 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-01 15:51:32 +0100
commit2824a8b40289344c788c3b18f2e33f2e238eeff8 (patch)
tree450779148648c2a8615428fbb5940bbbe25171b3 /redland
parentb8b088daf8c993e90b86a632c1077ae324414a84 (diff)
get rasqal built with mingw
Diffstat (limited to 'redland')
-rw-r--r--redland/rasqal/makefile.mk9
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.mingw11
2 files changed, 17 insertions, 3 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 76146d4a7868..45dbba6f93fe 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -64,18 +64,21 @@ PATCH_FILES=$(OOO_PATCH_FILES)
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
rasqal_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
rasqal_CC+=-shared-libgcc
.ENDIF
rasqal_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-rasqal_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
+
+rasqal_LDFLAGS=-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols
+.IF "$(ILIB)"!=""
+rasqal_LDFLAGS+= -L$(ILIB:s/;/ -L/)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="-nostdinc $(INCLUDE)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2,--export-all-symbols -L$(ILIB:s/;/ -L/)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) objdump" LIBXML2LIB=$(LIBXML2LIB) XSLTLIB="$(XSLTLIB)"
+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --disable-pcre --with-decimal=none --with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) lt_cv_cc_dll_switch="-shared" CC="$(rasqal_CC)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(rasqal_LDFLAGS)" LIBS="$(rasqal_LIBS)" OBJDUMP="$(WRAPCMD) $(HOST_PLATFORM)-objdump" LIBXML2LIB="$(LIBXML2LIB)" XSLTLIB="$(XSLTLIB)"
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.patch.mingw
new file mode 100644
index 000000000000..9c42a986b1d0
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.mingw
@@ -0,0 +1,11 @@
+--- misc/rasqal-0.9.16/src/Makefile.in
++++ misc/build/rasqal-0.9.16/src/Makefile.in
+@@ -355,7 +355,7 @@
+ 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@
++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 = \