[Libreoffice-commits] .: libxmlsec/xmlsec1-configure.patch

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Dec 1 04:46:40 PST 2012


 libxmlsec/xmlsec1-configure.patch |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 127a00a46358673047790b83a8433b909b46412c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 13:45:31 2012 +0100

    our xmlsec setup calls autoreconf, so patch Makefile.am too
    
    Should fix release tinderboxes.
    
    Change-Id: I90fc650dc089e94328ecb9d526f0905f5be5ce3c

diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 40a7175..ead9050 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -1,3 +1,17 @@
+--- misc/xmlsec1-1.2.14/Makefile.am
++++ misc/build/xmlsec1-1.2.14/Makefile.am
+@@ -1,8 +1,9 @@
+ NULL =
+ 
+ SAFE_VERSION	= @XMLSEC_VERSION_SAFE@
+-SUBDIRS 	= include src apps man docs
+-TEST_APP 	= apps/xmlsec1$(EXEEXT)
++#Do not build xmlsec1 app. It is not needed. Also the libtool includes 
++#a -L/path_to_lib_dir which may contain an incompatible lixbml2.
++SUBDIRS = include src man docs
+ DEFAULT_CRYPTO	= @XMLSEC_CRYPTO@
+ 
+ bin_SCRIPTS 	= xmlsec1-config
 --- misc/xmlsec1-1.2.14/Makefile.in	2009-06-25 22:53:34.000000000 +0200
 +++ misc/build/xmlsec1-1.2.14/Makefile.in	2009-10-01 10:32:48.708515261 +0200
 @@ -341,8 +341,9 @@


More information about the Libreoffice-commits mailing list