From 48fa8e4463b61a757eb108adeab58bba15bf6d02 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 1 Jul 2009 11:06:34 +0200 Subject: [PATCH] packaging(RHEL-CTDB): disable the merged build. Michael --- packaging/RHEL-CTDB/configure.rpm | 1 + packaging/RHEL-CTDB/samba.spec.tmpl | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index b9a1ee12c2b..84e73461a6f 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -58,6 +58,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ --without-ldb \ --without-dnsupdate \ --with-aio-support \ + --disable-merged-build $* make showlayout diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index a9bac921614..0df0bc1bded 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -185,7 +185,8 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \ --with-ctdb=/usr/include \ --without-ldb \ --without-dnsupdate \ - --with-aio-support + --with-aio-support \ + --disable-merged-build make showlayout @@ -249,7 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-ctdb=/usr/include \ --without-ldb \ --without-dnsupdate \ - --with-aio-support + --with-aio-support\ + --disable-merged-build make showlayout -- 2.34.1