mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-10-06 09:32:41 +02:00
Bug 780270 - MinGW build fail on Windows (broken m4 macro).
BUILD_EXEEXT was not properly set (config macro AX_PROG_CC_FOR_BUILD). Apparently we need aclocal/automake version 1.13 or higher and to distribute ax_prog_cc_for_build.m4 ourselves to benefit from a fix released only in autoconf 2.69. Thanks to Éric Hoffman for reporting and investigating on this. Automake 1.13 apparently dates from 2012 and debian testing provides a newer version (automake 1.15) so it should be ok to update it. Also that's only a build dependency.
This commit is contained in:
11
autogen.sh
11
autogen.sh
@@ -16,7 +16,7 @@ AUTOMAKE=${AUTOMAKE-automake-1.11}
|
|||||||
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
|
LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
|
||||||
|
|
||||||
AUTOCONF_REQUIRED_VERSION=2.54
|
AUTOCONF_REQUIRED_VERSION=2.54
|
||||||
AUTOMAKE_REQUIRED_VERSION=1.10.0
|
AUTOMAKE_REQUIRED_VERSION=1.13.0
|
||||||
INTLTOOL_REQUIRED_VERSION=0.40.1
|
INTLTOOL_REQUIRED_VERSION=0.40.1
|
||||||
LIBTOOL_REQUIRED_VERSION=1.5
|
LIBTOOL_REQUIRED_VERSION=1.5
|
||||||
LIBTOOL_WIN32_REQUIRED_VERSION=2.2
|
LIBTOOL_WIN32_REQUIRED_VERSION=2.2
|
||||||
@@ -166,15 +166,6 @@ elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
|
|||||||
elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
|
elif (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then
|
||||||
AUTOMAKE=automake-1.13
|
AUTOMAKE=automake-1.13
|
||||||
ACLOCAL=aclocal-1.13
|
ACLOCAL=aclocal-1.13
|
||||||
elif (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
|
|
||||||
AUTOMAKE=automake-1.12
|
|
||||||
ACLOCAL=aclocal-1.12
|
|
||||||
elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
|
|
||||||
AUTOMAKE=automake-1.11
|
|
||||||
ACLOCAL=aclocal-1.11
|
|
||||||
elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
|
|
||||||
AUTOMAKE=automake-1.10
|
|
||||||
ACLOCAL=aclocal-1.10
|
|
||||||
else
|
else
|
||||||
echo
|
echo
|
||||||
echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
|
echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
|
||||||
|
125
m4macros/ax_prog_cc_for_build.m4
Normal file
125
m4macros/ax_prog_cc_for_build.m4
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
# ===========================================================================
|
||||||
|
# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_PROG_CC_FOR_BUILD
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
# This macro searches for a C compiler that generates native executables,
|
||||||
|
# that is a C compiler that surely is not a cross-compiler. This can be
|
||||||
|
# useful if you have to generate source code at compile-time like for
|
||||||
|
# example GCC does.
|
||||||
|
#
|
||||||
|
# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
|
||||||
|
# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
|
||||||
|
# The value of these variables can be overridden by the user by specifying
|
||||||
|
# a compiler with an environment variable (like you do for standard CC).
|
||||||
|
#
|
||||||
|
# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
|
||||||
|
# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
|
||||||
|
# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
|
||||||
|
# substituted in the Makefile.
|
||||||
|
#
|
||||||
|
# LICENSE
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
|
||||||
|
#
|
||||||
|
# Copying and distribution of this file, with or without modification, are
|
||||||
|
# permitted in any medium without royalty provided the copyright notice
|
||||||
|
# and this notice are preserved. This file is offered as-is, without any
|
||||||
|
# warranty.
|
||||||
|
|
||||||
|
#serial 9
|
||||||
|
|
||||||
|
AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
|
||||||
|
AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
|
||||||
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_CPP])dnl
|
||||||
|
AC_REQUIRE([AC_EXEEXT])dnl
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
|
|
||||||
|
dnl Use the standard macros, but make them use other variable names
|
||||||
|
dnl
|
||||||
|
pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
|
||||||
|
pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
|
||||||
|
pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
|
||||||
|
pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
|
||||||
|
pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
|
||||||
|
pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
|
||||||
|
pushdef([ac_cv_objext], ac_cv_build_objext)dnl
|
||||||
|
pushdef([ac_exeext], ac_build_exeext)dnl
|
||||||
|
pushdef([ac_objext], ac_build_objext)dnl
|
||||||
|
pushdef([CC], CC_FOR_BUILD)dnl
|
||||||
|
pushdef([CPP], CPP_FOR_BUILD)dnl
|
||||||
|
pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
|
||||||
|
pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
|
||||||
|
pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
|
||||||
|
pushdef([host], build)dnl
|
||||||
|
pushdef([host_alias], build_alias)dnl
|
||||||
|
pushdef([host_cpu], build_cpu)dnl
|
||||||
|
pushdef([host_vendor], build_vendor)dnl
|
||||||
|
pushdef([host_os], build_os)dnl
|
||||||
|
pushdef([ac_cv_host], ac_cv_build)dnl
|
||||||
|
pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
|
||||||
|
pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
|
||||||
|
pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
|
||||||
|
pushdef([ac_cv_host_os], ac_cv_build_os)dnl
|
||||||
|
pushdef([ac_cpp], ac_build_cpp)dnl
|
||||||
|
pushdef([ac_compile], ac_build_compile)dnl
|
||||||
|
pushdef([ac_link], ac_build_link)dnl
|
||||||
|
|
||||||
|
save_cross_compiling=$cross_compiling
|
||||||
|
save_ac_tool_prefix=$ac_tool_prefix
|
||||||
|
cross_compiling=no
|
||||||
|
ac_tool_prefix=
|
||||||
|
|
||||||
|
AC_PROG_CC
|
||||||
|
AC_PROG_CPP
|
||||||
|
AC_EXEEXT
|
||||||
|
|
||||||
|
ac_tool_prefix=$save_ac_tool_prefix
|
||||||
|
cross_compiling=$save_cross_compiling
|
||||||
|
|
||||||
|
dnl Restore the old definitions
|
||||||
|
dnl
|
||||||
|
popdef([ac_link])dnl
|
||||||
|
popdef([ac_compile])dnl
|
||||||
|
popdef([ac_cpp])dnl
|
||||||
|
popdef([ac_cv_host_os])dnl
|
||||||
|
popdef([ac_cv_host_vendor])dnl
|
||||||
|
popdef([ac_cv_host_cpu])dnl
|
||||||
|
popdef([ac_cv_host_alias])dnl
|
||||||
|
popdef([ac_cv_host])dnl
|
||||||
|
popdef([host_os])dnl
|
||||||
|
popdef([host_vendor])dnl
|
||||||
|
popdef([host_cpu])dnl
|
||||||
|
popdef([host_alias])dnl
|
||||||
|
popdef([host])dnl
|
||||||
|
popdef([LDFLAGS])dnl
|
||||||
|
popdef([CPPFLAGS])dnl
|
||||||
|
popdef([CFLAGS])dnl
|
||||||
|
popdef([CPP])dnl
|
||||||
|
popdef([CC])dnl
|
||||||
|
popdef([ac_objext])dnl
|
||||||
|
popdef([ac_exeext])dnl
|
||||||
|
popdef([ac_cv_objext])dnl
|
||||||
|
popdef([ac_cv_exeext])dnl
|
||||||
|
popdef([ac_cv_prog_cc_g])dnl
|
||||||
|
popdef([ac_cv_prog_cc_cross])dnl
|
||||||
|
popdef([ac_cv_prog_cc_works])dnl
|
||||||
|
popdef([ac_cv_prog_gcc])dnl
|
||||||
|
popdef([ac_cv_prog_CPP])dnl
|
||||||
|
|
||||||
|
dnl Finally, set Makefile variables
|
||||||
|
dnl
|
||||||
|
BUILD_EXEEXT=$ac_build_exeext
|
||||||
|
BUILD_OBJEXT=$ac_build_objext
|
||||||
|
AC_SUBST(BUILD_EXEEXT)dnl
|
||||||
|
AC_SUBST(BUILD_OBJEXT)dnl
|
||||||
|
AC_SUBST([CFLAGS_FOR_BUILD])dnl
|
||||||
|
AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
|
||||||
|
AC_SUBST([LDFLAGS_FOR_BUILD])dnl
|
||||||
|
])
|
Reference in New Issue
Block a user