configure.in | 1 +
openssl/makefile.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5eb87c7b6a3e8c6e1057c71cd623b005b6745467
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 6 09:16:03 2012 +0100
fix case
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 666a202..68fb409 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -138,7 +138,7 @@ UNAME=$(shell uname)
.IF "$(COM)"=="GCC"
PATCH_FILES=opensslmingw.patch
-CONFIGURE_ACTION=$(PERL) configure
+CONFIGURE_ACTION=$(PERL) Configure
CONFIGURE_FLAGS=mingw shared
INSTALL_ACTION=mv libcrypto.a libcrypto_static.a && mv libcrypto.dll.a
libcrypto.a && mv libssl.a libssl_static.a && mv libssl.dll.a libssl.a
OUT2LIB = libcrypto_static.*
commit 27eb7b93dc0f3db356d1836e66e03ee9fac716bf
Author: David Tardon <dtar...@redhat.com>
Date: Tue Mar 6 09:01:49 2012 +0100
mingw: pass --disable-ccache to build's configure
diff --git a/configure.in b/configure.in
index 49ce97f..f6a2367 100644
--- a/configure.in
+++ b/configure.in
@@ -3249,6 +3249,7 @@ if test "$cross_compiling" = "yes"; then
test -n "$PKG_CONFIG_FOR_BUILD" && export
PKG_CONFIG="$PKG_CONFIG_FOR_BUILD"
cd CONF-FOR-BUILD
sub_conf_opts=""
+ test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts
--enable-ccache=$enable_ccache"
test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts
--with-ant-home=$with_ant_home"
test $with_java = no && sub_conf_opts="$sub_conf_opts --without-java"
test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
