Project

General

Profile

Bug #3718

"make distcheck" with DISTCHECK_CONFIGURE_FLAGS is broken

Added by osmith 11 days ago. Updated 10 days ago.

Status:
Resolved
Priority:
High
Assignee:
Target version:
-
Start date:
12/04/2018
Due date:
% Done:

100%

Spec Reference:

Description

According to the automake manuals, we should not set DISTCHECK_CONFIGURE_FLAGS in Makefile.am, but instead AM_DISTCHECK_CONFIGURE_FLAGS. Not doing so means, that we can't override the DISTCHECK_CONFIGURE_FLAGS. But we are trying to override them in several contrib/jenkins.sh files, so this is broken right now and does not test the configure flags we want it to test.

I've discovered this during #3385, where we would also use that variable to distcheck --enable-manuals.

History

#1 Updated by osmith 11 days ago

Turns out, DISTCHECK_CONFIGURE_FLAGS does get merged with AM_DISTCHECK_CONFIGURE_FLAGS. We still need to rename it, or else it gets completely ignored. But that is nice, because we don't need to specify the systemd flag in jenkins.sh then.

current master

Makefile.am contains:

DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

testing:

$ DISTCHECK_CONFIGURE_FLAGS="--some-random-flag-here" make -j5 distcheck
...
  && ../../configure \                                                                                                    
     \
    --with-systemdsystemunitdir=$dc_install_base//lib/systemd/system \                                                     
    --srcdir=../.. --prefix="$dc_install_base" \
...

modified

Makefile.am contains:

AM_DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)

testing:

$ DISTCHECK_CONFIGURE_FLAGS="--some-random-flag-here" make -j5 distcheck
...
  && ../../configure \
    --with-systemdsystemunitdir=$dc_install_base//lib/systemd/system \
    --some-random-flag-here \
    --srcdir=../.. --prefix="$dc_install_base" \
...

#2 Updated by osmith 11 days ago

  • % Done changed from 0 to 90

#3 Updated by osmith 11 days ago

Since this is also wrong in the systemd documentation, I submitted a patch to fix these docs as well:
https://github.com/systemd/systemd/pull/11048

#4 Updated by osmith 10 days ago

  • Status changed from In Progress to Resolved
  • % Done changed from 90 to 100

Also available in: Atom PDF

Add picture from clipboard (Maximum size: 48.8 MB)