- from libxslt-configure.patch: * drop config.sub Android stuff (obsolete) * drop MinGW archive checks (obsolete) * split out libxslt-config.patch.1 * split out libxslt-freebsd.patch.1 - drop libxslt-aix.patch: presumably don't need special check for V7BETA since it's released now - drop libxslt-mingw.patch (it's for msys build so obsolete) - drop libxslt-win_manifest.patch: this can just be passed on configure.js command line so no need for a patch Change-Id: I8a2cad0a70a86ba1dffbe3c8fce60babb70a61f6 Reviewed-on: https://gerrit.libreoffice.org/6641 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
36 lines
898 B
Groff
36 lines
898 B
Groff
Hack the xslt-config to return paths into WORKDIR.
|
|
|
|
--- a/xslt-config.in Wed Jan 17 14:18:26 2007
|
|
+++ b/xslt-config.in Wed Jun 25 13:06:05 2008
|
|
@@ -1,10 +1,16 @@
|
|
#! /bin/sh
|
|
|
|
-prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
+#prefix=@prefix@
|
|
+#exec_prefix=@exec_prefix@
|
|
+#exec_prefix_set=no
|
|
+#includedir=@includedir@
|
|
+#libdir=@libdir@
|
|
+
|
|
+prefix=${WORKDIR}/UnpackedTarball/xslt
|
|
+exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc
|
|
exec_prefix_set=no
|
|
-includedir=@includedir@
|
|
-libdir=@libdir@
|
|
+includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt
|
|
+libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs
|
|
|
|
usage()
|
|
{
|
|
@@ -89,7 +95,8 @@
|
|
shift
|
|
done
|
|
|
|
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
|
|
+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@"
|
|
+the_libs="-L${libdir} -lxslt -lm"
|
|
if test "$includedir" != "/usr/include"; then
|
|
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
|
|
else
|