[SSSD] [PATCHES] RHEL6 build fixes

Lukas Slebodnik lslebodn at redhat.com
Tue Jun 17 14:23:51 UTC 2014


On (17/06/14 15:09), Nikolai Kondrashov wrote:
>Hi everyone,
>
>Attached are several patches fixing RHEL6 build issues.
>
>Nick

>From adfb7725d982fed7cbd4ecefebd1128d244a0c85 Mon Sep 17 00:00:00 2001
>From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
>Date: Mon, 16 Jun 2014 19:39:25 +0300
>Subject: [PATCH 1/3] build: Switch back to DISTCHECK_CONFIGURE_FLAGS
>
>Switch back to using DISTCHECK_CONFIGURE_FLAGS instead of the
>AM_-version in Makefile.am, as the latter is not supported by Automake
>version in RHEL6.
>
>Instead, use a special variable EXTRA_DISTCHECK_CONFIGURE_FLAGS to
>augment distcheck target configure flags from the command line.
>---
> Makefile.am | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index f64c77a..25b8b96 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -7,10 +7,11 @@ if WITH_JOURNALD
>     extra_distcheck_flags += --with-syslog=journald
> endif
> 
>-AM_DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
>-                               --disable-dbus-tests \
>-                               --enable-all-experimental-features \
>-                               $(extra_distcheck_flags)
>+DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
>+                            --disable-dbus-tests \
>+                            --enable-all-experimental-features \
>+                            $(extra_distcheck_flags) \
>+                            $(EXTRA_DISTCHECK_CONFIGURE_FLAGS)
The prefix "EXTRA_" has special meaning in automake.
    e.g. EXTRA_LTLIBRARIES, EXTRA_PROGRAMS, EXTRA_progname_SOURCES ...
It would be better to avoid confusion and use different prefix.
    e.g. CUSTOM_DISTCHECK_CONFIGURE_FLAGS, MY_EXTRA_DISTCHECK_CONFIGURE_FLAGS

>From cfe87bd3a6f0282eaeb04f313cde264a3794691b Mon Sep 17 00:00:00 2001
>From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
>Date: Tue, 17 Jun 2014 11:58:26 +0300
>Subject: [PATCH 2/3] build: Propagate CIFS plugin status to distcheck
>
>Add "--disable-cifs-idmap-plugin" to DISTCHECK_CONFIGURE_FLAGS, if build
>of CIFS plugin was disabled. This fixes distcheck on RHEL6.
>---
> Makefile.am | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/Makefile.am b/Makefile.am
>index 25b8b96..0445f4a 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -7,6 +7,10 @@ if WITH_JOURNALD
>     extra_distcheck_flags += --with-syslog=journald
> endif
> 
>+if !BUILD_CIFS_IDMAP_PLUGIN
>+    extra_distcheck_flags += --disable-cifs-idmap-plugin
>+endif
>+
> DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
>                             --disable-dbus-tests \
>                             --enable-all-experimental-features \
>--
I am not big fan of disabling features in distcheck especially
hardcoded in Makefile.am. On the other side, we need to disable cifs-idmap
plugin on RHEL6.
    1) you need to run configure before distcheck and the same argument
       should be passed to configure and DISTCHECK_CONFIGURE_FLAGS.
    2) commit message doesn't corespond to patch.
       * BUILD_CIFS_IDMAP_PLUGIN is not related to RHEL6

It is possible to do it with the 1st patch
    "build: Switch back to DISTCHECK_CONFIGURE_FLAGS"

export DISTRO_CONFIGURE_FLAGS=--disable-cifs-idmap-plugin
./configure $DISTRO_CONFIGURE_FLAGS
make distcheck V=0 EXTRA_DISTCHECK_CONFIGURE_FLAGS=$DISTRO_CONFIGURE_FLAGS

>From a4ab4393debdec591a45736a6f563144b0088baa Mon Sep 17 00:00:00 2001
>From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
>Date: Tue, 17 Jun 2014 11:59:47 +0300
>Subject: [PATCH 3/3] build: Augment systemdconfdir at configure stage
>
>Add "/sssd.service.d" to systemdconfdir at configure stage, instead of
>the make stage. This way, if systemd is not used, systemdconfdir
>variable stays empty. That in turn, works around the attempt by older
>versions of Automake to create the installation directory even though no
>files are installed there [1].
>
>This fixes installation and distcheck target on RHEL6, where an
>"/sssd.service.d" directory creation would otherwise be attempted.
>
>[1] http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11030
>---
Could you provide steps how to test?
make distcheck passed in my case on rhel6

export DISTRO_CONFIGURE_FLAGS=--disable-cifs-idmap-plugin
./configure $DISTRO_CONFIGURE_FLAGS
make distcheck V=0 EXTRA_DISTCHECK_CONFIGURE_FLAGS=$DISTRO_CONFIGURE_FLAGS

LS



More information about the sssd-devel mailing list