This is an automated email from the ASF dual-hosted git repository. granthenke pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 841cc7cd7b2aa0b738118097132bada486ac5b1f Author: Scott Reynolds <[email protected]> AuthorDate: Sat Jun 29 15:21:35 2019 -0700 KUDU-2770: Upgrade bison to 3.0.5 Summary: Bison 3.0.4 does not compile under glib 2.28, a fix for this was introduced in http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e This also removes the patch for Mac OS High Sierra as it is believed to be no longer required Change-Id: I892af2d85bb481248715ba971a4439bc66ce4c90 Reviewed-on: http://gerrit.cloudera.org:8080/13446 Tested-by: Kudu Jenkins Reviewed-by: Grant Henke <[email protected]> --- thirdparty/download-thirdparty.sh | 9 +++------ .../patches/bison-fix-high-sierra-compilation-issue.patch | 15 --------------- thirdparty/vars.sh | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index dd51678..30d4ae2 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -409,16 +409,13 @@ fetch_and_patch \ $THRIFT_SOURCE \ $THRIFT_PATCHLEVEL -BISON_PATCHLEVEL=1 +BISON_PATCHLEVEL=0 fetch_and_patch \ $BISON_NAME.tar.gz \ $BISON_SOURCE \ - $BISON_PATCHLEVEL \ - "patch -p0 < $TP_DIR/patches/bison-fix-high-sierra-compilation-issue.patch" - # Fix compilation issue in macOS High Sierra - # See: https://github.com/spack/spack/issues/5521 + $BISON_PATCHLEVEL # This would normally call autoreconf, but it does not succeed with - # autoreconf 2.69 (RHEL 7): "autoreconf: 'configure.ac' or 'configure.in' is required". + # autoreconf 2.69-11 (RHEL 7): "autoreconf: 'configure.ac' or 'configure.in' is required". HIVE_PATCHLEVEL=0 fetch_and_patch \ diff --git a/thirdparty/patches/bison-fix-high-sierra-compilation-issue.patch b/thirdparty/patches/bison-fix-high-sierra-compilation-issue.patch deleted file mode 100644 index 0dff749..0000000 --- a/thirdparty/patches/bison-fix-high-sierra-compilation-issue.patch +++ /dev/null @@ -1,15 +0,0 @@ -With format string strictness, High Sierra also enforces that %n isn't used -in dynamic format strings, but we should just disable its use on darwin in -general. - ---- lib/vasnprintf.c.orig 2017-06-22 15:19:15.000000000 -0700 -+++ lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 -@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index 2e01115..ed8303e 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -213,7 +213,7 @@ THRIFT_VERSION=0.11.0 THRIFT_NAME=thrift-$THRIFT_VERSION THRIFT_SOURCE=$TP_SOURCE_DIR/$THRIFT_NAME -BISON_VERSION=3.0.4 +BISON_VERSION=3.0.5 BISON_NAME=bison-$BISON_VERSION BISON_SOURCE=$TP_SOURCE_DIR/$BISON_NAME
