From 19411c0dec12600241ec0ae318f0c8be70855212 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 10 Nov 2019 16:42:03 -0600 Subject: [PATCH] configure: fix schver.h parsing Related to #2890 --- racket/src/cfg-racket | 15 ++++++++++++++- racket/src/racket/configure.ac | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/racket/src/cfg-racket b/racket/src/cfg-racket index 77f303e1f6..a075ad87d0 100755 --- a/racket/src/cfg-racket +++ b/racket/src/cfg-racket @@ -6874,7 +6874,20 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/racket/src/schvers.h | cut -d '"' -f 2` + VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + + if test "${VERSION_W}" != "0" ; then + plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}.${VERSION_W}" + else + if test "${VERSION_Z}" != "0" ; then + plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}" + else + plt_lib_version="${VERSION_X}.${VERSION_Y}" + fi + fi fi AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o" diff --git a/racket/src/racket/configure.ac b/racket/src/racket/configure.ac index a7cfba5f5d..98c897c468 100644 --- a/racket/src/racket/configure.ac +++ b/racket/src/racket/configure.ac @@ -1383,7 +1383,20 @@ if test "${enable_shared}" = "yes" ; then if test "$INCLUDEDEP" = "-include" ; then plt_lib_version="\$(FWVERSION)" else - plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/racket/src/schvers.h | cut -d '"' -f 2` + VERSION_X=`grep 'define MZSCHEME_VERSION_X ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_Y=`grep 'define MZSCHEME_VERSION_Y ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_Z=`grep 'define MZSCHEME_VERSION_Z ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + VERSION_W=`grep 'define MZSCHEME_VERSION_W ' ${srcdir}/racket/src/schvers.h | cut -d ' ' -f 3` + + if test "${VERSION_W}" != "0" ; then + plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}.${VERSION_W}" + else + if test "${VERSION_Z}" != "0" ; then + plt_lib_version="${VERSION_X}.${VERSION_Y}.${VERSION_Z}" + else + plt_lib_version="${VERSION_X}.${VERSION_Y}" + fi + fi fi AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o"