summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-03 14:18:18 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-03 14:47:30 +0200
commit2745cca129a255030fcc468ac60f0e48d04c9313 (patch)
tree2756c757a98629274c57bd10a28db9b554ddd7b4
parentfc1eaf33e01872cab3c9cdc534de12b32d028899 (diff)
libxslt: remove usage of dmake remnant XSLTLIB
Change-Id: Idb5dc8d0036b99a71cd8c1c0e740939074cc1a48
-rw-r--r--libxslt/libxslt-configure.patch2
-rw-r--r--redland/ExternalProject_raptor.mk1
-rw-r--r--redland/ExternalProject_rasqal.mk1
3 files changed, 1 insertions, 3 deletions
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 003cd2c0cf8d..6b189df5aa0d 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -73,7 +73,7 @@
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
-+the_libs="-L${libdir} ${XSLTLIB} -lm"
++the_libs="-L${libdir} -lxslt -lm"
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 058da4965332..f522f56c8b04 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
- XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index d722100755da..b82e4c134c9b 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
- XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \