Projet

Général

Profil

0001-enable-user-supplied-CFLAGS.patch

git formatted patch to resolve issue - John Dennis, 15 juin 2016 22:31

Télécharger (2,46 ko)

Voir les différences:

Subject: [PATCH] enable user supplied CFLAGS
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

CFLAGS is initialized to the empty string in configure.ac, this
effectively turned off user supplied values for CFLAGS preventing site
specific values from being used. A further complicating factor was of
all the user supplied values documented in Automake only CFLAGS was
disabled allowing all other user supplied variables to take
effect. Some variables must be coordinated (e.g. CFLAGS with LDFLAGS),
the fact LDFLAGS was picked up from the environment but CFLAGS was
discarded caused build failures due to incompatible combination of
compiler and linker options.

The problem was first introduced in commit: 73d9c98f "Reset CFLAGS
when --enable-debugging is used". This patch simply removes hardcoding
CFLAGS to the empty string and appends the debug options
(--enable-debugging) to the existing CFLAGS.

Proper use of the variables is described in the Automake documentation
in the section "Flag Variables Ordering"
https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html

Although the Automake documentation claims manipulating CFLAGS
directly is improper use there are many examples of this in the
existing configure.ac, this patch makes no attempt at addressing this
issue, rather it makes existing usage consistent. In the particular
case of debug flags appending to CFLAGS is probably the only valid
solution because the debug flags must appear at the end of the list of
flags in order to override earlier flags, CFLAGS always appears last
in the Makefile (see above Automake doc).

Signed-off-by: John Dennis <jdennis@redhat.com>
License: MIT
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
configure.ac
91 91
dnl Check for programs
92 92
dnl
93 93
AC_PROG_CC
94
CFLAGS=""
95 94
AM_CFLAGS=""
96 95
AC_HEADER_STDC
97 96
LT_AC_PROG_RC
......
702 701
if test "z$enable_debugging" = "zyes" ; then
703 702
    enable_debugging=yes
704 703
    LASSO_DEFINES="$LASSO_DEFINES -DLASSO_DEBUG"
705
    AM_CFLAGS="-O0 -g -Wall -Wextra -Werror"
704
    CFLAGS="$CFLAGS -O0 -g -Wall -Wextra -Werror"
706 705
else
707 706
    enable_debugging=no
708 707
fi    
709
-