Skip to content

Commit ce91497

Browse files
committed
Drop 4ti2's autoconf version down to 2.69 for older systems
[ci skip]
1 parent e8680c4 commit ce91497

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

M2/cmake/build-libraries.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,9 @@ ExternalProject_Add(build-4ti2
773773
SOURCE_DIR libraries/4ti2/build
774774
DOWNLOAD_DIR ${CMAKE_SOURCE_DIR}/BUILD/tarfiles
775775
BUILD_IN_SOURCE ON
776-
PATCH_COMMAND mkdir swig # needed because the tar doesn't have a swig directory but 4ti2's Makefile.am seems to need it
777-
CONFIGURE_COMMAND autoreconf -vif
776+
PATCH_COMMAND patch --batch -p1 < ${CMAKE_SOURCE_DIR}/libraries/4ti2/patch-1.6.11
777+
# tar doesn't have a swig directory but 4ti2's Makefile.am seems to need it
778+
CONFIGURE_COMMAND mkdir -p swig && autoreconf -vif
778779
COMMAND ${CONFIGURE} --prefix=${M2_HOST_PREFIX}
779780
#-C --cache-file=${CONFIGURE_CACHE}
780781
--with-glpk=${GLPK_ROOT}

M2/libraries/4ti2/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 1.6.11
33
TARDIR = 4ti2-$(VERSION)
44

5-
# PATCHFILE = @abs_srcdir@/patch-$(VERSION)
5+
PATCHFILE = @abs_srcdir@/patch-$(VERSION)
66
PRECONFIGURE = mkdir -p swig && autoreconf -vif
77

88
VERSION_ = $(shell echo $(VERSION) | sed 's/\./_/g')

M2/libraries/4ti2/patch-1.6.11

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Description: Drop autoconf version down to 2.69 for older systems
2+
3+
--- a/configure.ac
4+
+++ 4ti2-1.6.11/configure.ac
5+
@@ -1,7 +1,7 @@
6+
# -*- Autoconf -*-
7+
# Process this file with autoconf to produce a configure script.
8+
9+
-AC_PREREQ([2.71])
10+
+AC_PREREQ([2.69])
11+
AC_INIT([4ti2],[1.6.11])
12+
AC_CONFIG_MACRO_DIR([m4])
13+
AM_INIT_AUTOMAKE([foreign std-options])

0 commit comments

Comments
 (0)