config_host.mk.in | 1 - configure.ac | 16 ++-------------- solenv/gbuild/platform/com_GCC_class.mk | 21 +-------------------- 3 files changed, 3 insertions(+), 35 deletions(-)
New commits: commit d496bcdb770a61400abf4f67baae5103505f8a34 Author: Norbert Thiebaud <[email protected]> Date: Wed Jul 10 21:01:11 2013 -0500 we do not support any platform with bison < 2.0 anymore Change-Id: Ia2c1c6ed43c6a42fa1a65a22f4c8d68de216706c Reviewed-on: https://gerrit.libreoffice.org/4822 Reviewed-by: Petr Mladek <[email protected]> Tested-by: Petr Mladek <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index 58d2a0e..8e14d7a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -15,7 +15,6 @@ export BUILDDIR=@BUILDDIR@ @x_AFLAGS@ export AFLAGS=@AFLAGS@ export ALLOC=@ALLOC@ export ALL_LANGS=@ALL_LANGS@ -export ANCIENT_BISON=@ANCIENT_BISON@ export ANDROID_APP_ABI=@ANDROID_APP_ABI@ export ANDROID_NDK_GDBSERVER=@ANDROID_NDK_GDBSERVER@ export ANDROID_SDK_HOME=@ANDROID_SDK_HOME@ diff --git a/configure.ac b/configure.ac index 69479c3..3db1813 100644 --- a/configure.ac +++ b/configure.ac @@ -9219,29 +9219,17 @@ dnl *************************************** dnl Checking for bison and flex dnl *************************************** AC_PATH_PROG(BISON, bison) -ANCIENT_BISON="NO" if test -z "$BISON"; then AC_MSG_ERROR([no bison found in \$PATH, install it]) else AC_MSG_CHECKING([the bison version]) _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'` _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` - # Accept newer than 1.875 or older(equal) than 1.75 - if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then - if test "$_bison_version" = "1.875"; then - AC_MSG_WARN([suspect ($BISON $_bison_version)]) - add_warning "Suspect ($BISON $_bison_version) suggest upgrade" - else - AC_MSG_RESULT([checked ($BISON $_bison_version)]) - fi - else - AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))]) - fi + # Accept newer than 2.0 if test "$_bison_longver" -lt 2000; then - ANCIENT_BISON="YES" + AC_MSG_ERROR([failed ($BISON $_bison_version need 2.0+)]) fi fi -AC_SUBST(ANCIENT_BISON) AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 5464715..e16ad03 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -233,33 +233,14 @@ endef # YaccTarget class -ifeq ($(ANCIENT_BISON),YES) -# -# There are ancient versions of bison out there, which do not handle -# well .cxx extensions, nor do they support --defines=<file>. The -# result is that the header is named <foo>.cxx.h instead of <foo>.hxx -# so we queue a mv to rename the header accordingly. -# One example is XCode versions 2.x, which are used on OSX ppc -# machines. -# define gb_YaccTarget__command $(call gb_Output_announce,$(2),$(true),YAC,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ - $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1) && mv $(5).h $(4) && touch $(3) ) + $(gb_YACC) $(T_YACCFLAGS) -v --defines=$(4) -o $(5) $(1) && touch $(3) ) endef -else -define gb_YaccTarget__command -$(call gb_Output_announce,$(2),$(true),YAC,3) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(3)) && \ - $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) ) - -endef -endif - # ExternalProject class gb_ExternalProject_use_autoconf := _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
