libxmlsec/makefile.mk | 6 +++++- libxmlsec/xmlsec1-1.2.14-ansi.patch | 13 +++++++++++++ solenv/gbuild/Output.mk | 10 +++++----- 3 files changed, 23 insertions(+), 6 deletions(-)
New commits: commit 0e3f66c5f68dfeee1e29198f1f17938e78087660 Author: Stephan Bergmann <[email protected]> Date: Wed Aug 29 23:00:18 2012 +0200 No space inside brackets Change-Id: I6f6222d7c4c928b29ac092d3afef125f2e552b8e diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk index 9bb3168..8d50e09 100644 --- a/solenv/gbuild/Output.mk +++ b/solenv/gbuild/Output.mk @@ -29,7 +29,7 @@ # user notifications and formatting define gb_Output__format_type -[ $(word 2,$(1) build clean) $(2) ] +[$(word 2,$(1) build clean) $(2)] endef define gb_Output__format_target @@ -47,11 +47,11 @@ define gb_Output_announce_bell endef define gb_Output_info -$(info [ info $(2) ] $(1)) +$(info [info $(2)] $(1)) endef define gb_Output_warn -$(warning $(NEWLINE)[ WARN $(2) ] !!!$(NEWLINE)[ WARN $(2) ] !!! $(1)$(NEWLINE)[ WARN $(2) ] !!!) +$(warning $(NEWLINE)[WARN $(2)] !!!$(NEWLINE)[WARN $(2)] !!! $(1)$(NEWLINE)[WARN $(2)] !!!) endef gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -) @@ -107,11 +107,11 @@ $(subst :, ,$(word 2,$(1) \ endef define gb_Output_info -$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[ $(gb_Output_COLOR_INBUILD_LEVEL6)info $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6) ]$(gb_Output_COLOR_RESET) $(1)) +$(info $(gb_Output_COLOR_OUTBUILD_LEVEL6)[$(gb_Output_COLOR_INBUILD_LEVEL6)info $(2)$(gb_Output_COLOR_OUTBUILD_LEVEL6)]$(gb_Output_COLOR_RESET) $(1)) endef define gb_Output_warn -$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[ $(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6) ]$(gb_Output_COLOR_RESET) !!!) +$(warning $(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET) !!!$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET) !!! $(1)$(NEWLINE)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)[$(gb_Output_COLOR_INCLEAN_LEVEL6)WARN $(2)$(gb_Output_COLOR_OUTCLEAN_LEVEL6)]$(gb_Output_COLOR_RESET) !!!) endef define gb_Output_error commit 7947da50b3457b7ca10d75db85e3317eaed032d1 Author: Stephan Bergmann <[email protected]> Date: Wed Aug 29 22:59:22 2012 +0200 Work around autoreconf de-ANSI-fication support error Change-Id: I990167289fe39bbfdb3b40abf8fc522dabb7cc20 diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 22d280b..1e68085 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -57,6 +57,9 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-mingw32.patch: Mingw32 support. #xmlsec1-mingw-customkeymanage-addmscrypto.patch: builds the custom keymanager on mingw #xmlsec1-vc.path: support for Visual C++ 10 +#xmlsec1-1.2.14-ansi.patch: otherwise, at least MacPorts autoreconf (GNU +# Autoconf) 2.69 fails with "configure.in:50: error: automatic de-ANSI-fication +# support has been removed" PATCH_FILES=\ xmlsec1-configure.patch \ xmlsec1-configure-libxml-libxslt.patch \ @@ -69,7 +72,8 @@ PATCH_FILES=\ xmlsec1-mingw-keymgr-mscrypto.patch \ xmlsec1-vc10.patch \ xmlsec1-1.2.14_fix_extern_c.patch \ - xmlsec1-android.patch + xmlsec1-android.patch \ + xmlsec1-1.2.14-ansi.patch ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ diff --git a/libxmlsec/xmlsec1-1.2.14-ansi.patch b/libxmlsec/xmlsec1-1.2.14-ansi.patch new file mode 100644 index 0000000..24a9584 --- /dev/null +++ b/libxmlsec/xmlsec1-1.2.14-ansi.patch @@ -0,0 +1,13 @@ +--- misc/xmlsec1-1.2.14/configure.in 2012-08-29 22:44:51.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/configure.in 2012-08-29 22:46:23.000000000 +0200 +@@ -46,10 +46,6 @@ + AC_PATH_PROG(HELP2MAN, help2man) + AC_PATH_PROG(MAN2HTML, man2html) + +-dnl Make sure we have an ANSI compiler +-AM_C_PROTOTYPES +-test "z$U" != "z" && AC_MSG_ERROR(Compiler not ANSI compliant) +- + dnl Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
