git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f712403)
packaging(RHEL-CTDB): disable the merged build.
authorMichael Adam <obnox@samba.org>
Wed, 1 Jul 2009 09:06:34 +0000 (11:06 +0200)
committerKarolin Seeger <kseeger@samba.org>
Thu, 26 Nov 2009 10:40:50 +0000 (11:40 +0100)
Michael
(cherry picked from commit 94bcef772d2a78711a345963aa1edc7037d7057d)

packaging/RHEL-CTDB/configure.rpm patch | blob | history
packaging/RHEL-CTDB/samba.spec.tmpl patch | blob | history

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index b9a1ee12c2beb6f05065f98916874cec72e1264e..84e73461a6f594e059d6404c83badbc55c70a3b0 100755 (executable)
--- 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 a9bac9216145f87311cc7d721e23495b9210ed41..0df0bc1bded2f72bedab4f7c5039364d32031ccc 100644 (file)
--- 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
 
Samba Shared Repository