Opened 6 years ago

Closed 6 years ago

#15606 closed defect (fixed)

Move checks from prereq.sh to configure

Reported by: jdemeyer Owned by:
Priority: blocker Milestone: sage-6.1
Component: build Keywords:
Cc: ohanar, vbraun Merged in:
Authors: Jeroen Demeyer Reviewers: Volker Braun
Report Upstream: N/A Work issues:
Branch: u/vbraun/ticket/15606 (Commits) Commit: 8b69cf4ab04f4461e90e3acfb7908cd4f6528a56
Dependencies: #15596, #15580 Stopgaps:

Description

Follow-up after #15580.

Change History (33)

comment:1 Changed 6 years ago by jdemeyer

  • Summary changed from Further integration of prereq to Move checks from prereq.sh to configure

comment:2 Changed 6 years ago by jdemeyer

  • Branch set to u/jdemeyer/ticket/15606
  • Created changed from 12/29/13 11:23:09 to 12/29/13 11:23:09
  • Modified changed from 12/29/13 13:20:41 to 12/29/13 13:20:41

comment:3 Changed 6 years ago by jdemeyer

  • Dependencies set to #15580

comment:4 Changed 6 years ago by git

  • Commit set to ac5c182d789e94b365dbc1d916208af7afd92840

Branch pushed to git repo; I updated commit sha1. This was a forced push. Recent commits:

ac5c182Move checks from prereq.sh to configure
143e5e4Don't use cp -p in sage-clone-source
63e1300Integrate prereq in the build system
0881c74Merge in prereq-1.2
cb5e072Trac #14406: remove sqrtl() and SAGE_FORTRAN/SAGE_FORTRAN_LIB checks

comment:5 Changed 6 years ago by jdemeyer

  • Cc ohanar added
  • Dependencies changed from #15580 to #15596, #15580
  • Status changed from new to needs_review

comment:6 Changed 6 years ago by jdemeyer

  • Status changed from needs_review to needs_work

comment:7 follow-up: Changed 6 years ago by vbraun

Is goal to have the actual version written into the autoconf output or is there a way to keep it unexpandend and only set a variable when you run ./configure?

comment:8 in reply to: ↑ 7 Changed 6 years ago by jdemeyer

Replying to vbraun:

Is goal to have the actual version written into the autoconf output

That's the current approach and that surely works.

or is there a way to keep it unexpandend and only set a variable when you run ./configure?

No idea, I have not checked.

comment:9 Changed 6 years ago by git

  • Commit changed from ac5c182d789e94b365dbc1d916208af7afd92840 to 0f92bb172601132f0cd01c6e891cd8ad64cdbebb

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

68ac77fMerge branch 'u/jdemeyer/ticket/15596' of git://trac.sagemath.org/sage into ticket/15580
0255a2aAllow sage --sdist without building Sage
19d5a15Create and use "configure" tarball for auto-generated files
5d7729cUse build/pkgs/configure/package-version.txt for configure version number
e13b216Create sage-autogen script to generate configure tarball
900212erename to bootstrap, run during version bump
56adaa6add a SPKG.txt file
1c57e53also commit changes to confball in sage-update-version
5d17bdafix typos in SPKG.txt
cdc7c0amake saving of the confball optional in bootstrap

comment:10 Changed 6 years ago by git

  • Commit changed from 0f92bb172601132f0cd01c6e891cd8ad64cdbebb to 0a4e34e383c512699697140440a8857e74083d13

Branch pushed to git repo; I updated commit sha1. New commits:

0a4e34eRevert changes to sage-update-version

comment:11 Changed 6 years ago by git

  • Commit changed from 0a4e34e383c512699697140440a8857e74083d13 to fc1b6075c301f7c7dc649fbf4c492454844235ec

Branch pushed to git repo; I updated commit sha1. New commits:

fc1b607Symlink config.log to logs/pkgs/config.log

comment:12 Changed 6 years ago by git

  • Commit changed from fc1b6075c301f7c7dc649fbf4c492454844235ec to aee21c61138e1c6b35a32d5ef09f48a1ad58727c

Branch pushed to git repo; I updated commit sha1. New commits:

e03f296Source sage-env inside configure
3e5dfa5fix tarball url
e1df3ceRun "missing" using bash
a38f919allow disabling of maintainer mode
2e27abbDon't use "missing"
aee21c6Merge branch 'u/jdemeyer/ticket/15580' of git://trac.sagemath.org/sage into ticket/15606

comment:13 Changed 6 years ago by git

  • Commit changed from aee21c61138e1c6b35a32d5ef09f48a1ad58727c to 2c2f372497b5e1f15ee870c4ec8b50f4821f17d7

Branch pushed to git repo; I updated commit sha1. New commits:

2c2f372Move all bootstrapping to ./bootstrap

comment:14 Changed 6 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:15 Changed 6 years ago by jdemeyer

  • Cc vbraun added

comment:16 Changed 6 years ago by vbraun

  • Reviewers set to Volker Braun
  • Status changed from needs_review to positive_review

comment:17 Changed 6 years ago by vbraun

  • Branch changed from u/jdemeyer/ticket/15606 to u/vbraun/ticket/15606

comment:18 Changed 6 years ago by vbraun

  • Commit changed from 2c2f372497b5e1f15ee870c4ec8b50f4821f17d7 to f10ca8f7b5fad0d5f140cc81253ebc25fa87156e

needs version bump for confball since configure uses additional macros...


New commits:

b1d5009Merge tag '6.1.beta6' into t/15606/ticket/15606
f10ca8fbump confball version

comment:19 Changed 6 years ago by vbraun

Still fails on bsd and mod:

./bootstrap -d
make[1]: Entering directory `/mnt/SSD1/mod_buildslave/sage_git/build'
rm -rf config configure build/Makefile-auto.in
make[1]: Leaving directory `/mnt/SSD1/mod_buildslave/sage_git/build'
configure.ac:19: error: m4_defn: undefined macro: _m4_divert_diversion
configure.ac:19: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: autom4te failed with exit status: 1
make: *** [configure] Error 1
make: Target `start' not remade because of errors.

How about catching any non-zero exit status in bootstrap?

comment:20 Changed 6 years ago by vbraun

  • Status changed from positive_review to needs_work

comment:21 Changed 6 years ago by jdemeyer

  • Branch changed from u/vbraun/ticket/15606 to u/jdemeyer/ticket/15606
  • Modified changed from 01/21/14 15:09:48 to 01/21/14 15:09:48

comment:22 Changed 6 years ago by jdemeyer

  • Commit changed from f10ca8f7b5fad0d5f140cc81253ebc25fa87156e to 157b6464992242f75837cd7adf9031e7945abb29
  • Status changed from needs_work to needs_review

New commits:

157b646Require autoconf 2.64

comment:23 Changed 6 years ago by jdemeyer

  • Priority changed from major to blocker

comment:24 Changed 6 years ago by vbraun

Fails with

$ ./bootstrap 
rm -rf config configure build/Makefile-auto.in
configure.ac:22: error: m4_divert_push: cannot change diversion to `GROW' inside m4_expand
configure.ac:22: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: error: echo failed with exit status: 1

comment:25 Changed 6 years ago by vbraun

Verbose output:

[...]
aclocal: running echo 'm4_define([m4_require_silent_probe], [-])' | /usr/bin/autom4te --language Autoconf-without-aclocal-m4  - /usr/share/aclocal-1.13/internal/ac-config-macro-dirs.m4 '/usr/share/aclocal-1.13/amversion.m4' '/usr/share/aclocal-1.13/auxdir.m4' '/usr/share/aclocal-1.13/cond.m4' '/usr/share/aclocal-1.13/depend.m4' '/usr/share/aclocal-1.13/depout.m4' '/usr/share/aclocal-1.13/init.m4' '/usr/share/aclocal-1.13/install-sh.m4' '/usr/share/aclocal-1.13/lead-dot.m4' '/usr/share/aclocal-1.13/maintainer.m4' '/usr/share/aclocal-1.13/make.m4' '/usr/share/aclocal-1.13/missing.m4' '/usr/share/aclocal-1.13/options.m4' '/usr/share/aclocal-1.13/runlog.m4' '/usr/share/aclocal-1.13/sanity.m4' '/usr/share/aclocal-1.13/silent.m4' '/usr/share/aclocal-1.13/strip.m4' '/usr/share/aclocal-1.13/substnot.m4' '/usr/share/aclocal-1.13/tar.m4' --trace='AC_DEFUN:$f::$n::${::}%' --trace='AC_DEFUN_ONCE:$f::$n::${::}%' --trace='AU_DEFUN:$f::$n::${::}%' --trace='_AM_AUTOCONF_VERSION:$f::$n::${::}%' --trace='AC_CONFIG_MACRO_DIR_TRACE:$f::$n::${::}%' --trace='AC_CONFIG_MACRO_DIR:$f::$n::${::}%' --trace='_AM_CONFIG_MACRO_DIRS:$f::$n::${::}%' --trace='_AM_SUBST_NOTMAKE:$f::$n' --trace='_AM_IF_OPTION:$f::$n' --trace='AM_OUTPUT_DEPENDENCY_COMMANDS:$f::$n' --trace='AM_SET_DEPDIR:$f::$n' --trace='AM_PROG_INSTALL_SH:$f::$n' --trace='_AM_SET_OPTIONS:$f::$n' --trace='AM_SET_LEADING_DOT:$f::$n' --trace='AM_SUBST_NOTMAKE:$f::$n' --trace='_AM_MANGLE_OPTION:$f::$n' --trace='_AM_PROG_TAR:$f::$n' --trace='AM_DEP_TRACK:$f::$n' --trace='AM_MAKE_INCLUDE:$f::$n' --trace='AM_INIT_AUTOMAKE:$f::$n' --trace='AM_SET_CURRENT_AUTOMAKE_VERSION:$f::$n' --trace='AM_AUX_DIR_EXPAND:$f::$n' --trace='_AM_OUTPUT_DEPENDENCY_COMMANDS:$f::$n' --trace='AM_CONDITIONAL:$f::$n' --trace='AM_MAINTAINER_MODE:$f::$n' --trace='AM_MISSING_HAS_RUN:$f::$n' --trace='_AM_DEPENDENCIES:$f::$n' --trace='_AM_SET_OPTION:$f::$n' --trace='AM_PROG_INSTALL_STRIP:$f::$n' --trace='AM_SILENT_RULES:$f::$n' --trace='SAGE_VERSION:$f::$n' --trace='AM_RUN_LOG:$f::$n' --trace='AM_SANITY_CHECK:$f::$n' --trace='AM_AUTOMAKE_VERSION:$f::$n' --trace='_AC_AM_CONFIG_HEADER_HOOK:$f::$n' --trace='AM_MISSING_PROG:$f::$n' configure.ac
configure.ac:22: error: m4_divert_push: cannot change diversion to `GROW' inside m4_expand
configure.ac:22: the top level
[...]

comment:26 Changed 6 years ago by jdemeyer

Which system and autoconf/automake versions?

comment:27 Changed 6 years ago by vbraun

  • autoconf 2.69
  • automake 1.13.4

comment:28 Changed 6 years ago by vbraun

  • Branch changed from u/jdemeyer/ticket/15606 to u/vbraun/ticket/15606

comment:29 Changed 6 years ago by vbraun

  • Commit changed from 157b6464992242f75837cd7adf9031e7945abb29 to 8b69cf4ab04f4461e90e3acfb7908cd4f6528a56

no square brackets in the middle AC_INIT argument seems to fix it


New commits:

8b69cf4fix for the m4_divert_push error

comment:30 Changed 6 years ago by jdemeyer

  • Status changed from needs_review to positive_review

comment:31 Changed 6 years ago by vbraun

  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:32 Changed 6 years ago by vbraun

  • Resolution fixed deleted
  • Status changed from closed to new

Confball is saved under the not-yet-incremented name...

comment:33 Changed 6 years ago by vbraun

  • Resolution set to fixed
  • Status changed from new to closed

lets move it to #15700...

Note: See TracTickets for help on using tickets.